From 72c7ce272241dad90b32c946d64bfd7085afc616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Tue, 3 Mar 2020 07:09:38 +0100 Subject: [PATCH 1/2] Go modules (#15853) This PR introduces the new dependency management system for beats. From now on we are using `go mod` instead of `govendor`. The name of the module we provide is named `github.com/elastic/beats/v7`. We adopted go modules, but we still keep dependencies under the folder `vendor`. However, it is maintained by `go mod` now by running `mage vendor`. Thus, it is not possible to add local changes to the dependencies there because next time someone runs the command it will be overwritten. **If you need to apply patches to dependencies either fork the repository or try to contribute it back to the original repo.** This PR does not address the changes in Beat generators. Those are going to be updated in a follow-up PR. TL;DR ```sh go get {{ module_name }}@{{ required_version }} mage vendor make notice ``` Run `go get {{ module_name }}@{{ required_version }}` in the repository. This adds the module to the requirements list in `go.mod`. In order to add the dependency to the vendor folder, run `mage vendor`. If the dependency contains files which are not copied by this command (e.g. C source files), add them to this list: https://github.com/elastic/beats/tree/master/dev-tools/mage/gomod.go The process is similar to adding a new dependency. Except for one step. If the dependency is updated to a newer major version, make sure to follow up changes in the root import paths of those libs. I suggest using the tool named `mod` to upgrade it: https://github.com/marwan-at-work/mod If you need to use a fork of a dependency, add it to `go.mod` either manually or by running the following command: ```sh go mod edit -replace {{ dependency_name }}={{ fork_name }}@{{ fork_version }} ``` In a nutshell, it is needed to tell apart major version changes. Their import paths are different because those are incompatible. See more: https://blog.golang.org/v2-go-modules Thus, when we are releasing v8.0.0, we need to change the import path again. The tool named mod is going to be useful for us in this case, too. Are you seeing the following error? ``` make[1]: Leaving directory `/home/travis/gopath/src/github.com/elastic/beats' diff --git a/go.mod b/go.mod index 170f6660..fc5fb6ee 100644 --- a/go.mod +++ b/go.mod @@ -53,6 +53,7 @@ require ( github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 + github.com/elastic/beats v7.6.0+incompatible github.com/elastic/ecs v1.4.0 github.com/elastic/go-libaudit v0.4.0 github.com/elastic/go-licenser v0.2.1 ``` If your `go.mod` lists `github.com/elastic/beats` as a requirement, the repo contains an outdated root import path. Change `github.com/elastic/beats` to `github.com/elastic/beats/v7`. After this PR is merged, please rebase all of your open PRs. In most cases rebasing will lead to conflicts. Possible sources of conflicts: 1. New import path conflicts with the old. To resolve it switch every `github.com/elastic/beats` import to `github.com/elasitc/beats/v7`. 2. A new dependency has been added or existing was updated. Update the dependency using go modules. - [Golang blog: Using Go modules](https://blog.golang.org/using-go-modules) - [Golang wiki](https://github.com/golang/go/wiki/Modules) elastic/beats#15868 (cherry picked from commit 95626b8f1690344312c0831ab2bdcbccffe4d089) --- .travis.yml | 33 +- Makefile | 7 +- NOTICE.txt | 3561 +-- auditbeat/cmd/root.go | 10 +- auditbeat/core/eventmod.go | 4 +- auditbeat/datastore/datastore.go | 2 +- auditbeat/helper/hasher/hasher.go | 4 +- auditbeat/include/fields.go | 2 +- auditbeat/include/list.go | 4 +- auditbeat/magefile.go | 8 +- auditbeat/main.go | 8 +- auditbeat/main_test.go | 4 +- auditbeat/module/auditd/audit_linux.go | 10 +- auditbeat/module/auditd/audit_linux_test.go | 12 +- auditbeat/module/auditd/audit_unsupported.go | 4 +- auditbeat/module/auditd/config_linux_test.go | 2 +- auditbeat/module/auditd/fields.go | 2 +- auditbeat/module/auditd/show_linux.go | 2 +- auditbeat/module/file_integrity/config.go | 2 +- .../module/file_integrity/config_test.go | 2 +- auditbeat/module/file_integrity/event.go | 8 +- auditbeat/module/file_integrity/event_test.go | 2 +- .../file_integrity/eventreader_fsevents.go | 2 +- .../file_integrity/eventreader_fsnotify.go | 4 +- auditbeat/module/file_integrity/fields.go | 2 +- .../module/file_integrity/fileinfo_windows.go | 2 +- .../module/file_integrity/flatbuffers.go | 2 +- auditbeat/module/file_integrity/metricset.go | 8 +- .../module/file_integrity/metricset_test.go | 8 +- .../file_integrity/monitor/recursive.go | 2 +- auditbeat/module/file_integrity/scanner.go | 2 +- auditbeat/scripts/mage/config.go | 2 +- auditbeat/scripts/mage/docs.go | 2 +- auditbeat/scripts/mage/package.go | 2 +- auditbeat/testing/setup.go | 2 +- dev-tools/cmd/asset/asset.go | 4 +- dev-tools/cmd/dashboards/export_dashboards.go | 4 +- dev-tools/cmd/module_fields/module_fields.go | 6 +- .../module_include_list.go | 4 +- dev-tools/generate_notice.py | 202 +- dev-tools/jenkins_ci.ps1 | 2 +- dev-tools/mage/build.go | 27 +- dev-tools/mage/check.go | 4 +- dev-tools/mage/crossbuild.go | 8 +- dev-tools/mage/dashboard.go | 2 +- dev-tools/mage/fields.go | 29 +- dev-tools/mage/fmt.go | 19 +- dev-tools/mage/godaemon.go | 2 +- dev-tools/mage/gomod.go | 96 + dev-tools/mage/gotool/go.go | 43 + dev-tools/mage/gotool/modules.go | 54 + dev-tools/mage/install.go | 25 +- dev-tools/mage/integtest.go | 5 +- dev-tools/mage/pkg_test.go | 2 +- dev-tools/mage/settings.go | 258 +- dev-tools/mage/target/build/build.go | 2 +- dev-tools/mage/target/collectors/collect.go | 2 +- dev-tools/mage/target/common/check.go | 2 +- dev-tools/mage/target/common/clean.go | 2 +- dev-tools/mage/target/common/fmt.go | 2 +- dev-tools/mage/target/common/shared.go | 2 +- dev-tools/mage/target/compose/compose.go | 2 +- .../mage/target/dashboards/dashboards.go | 2 +- dev-tools/mage/target/docs/docs.go | 2 +- dev-tools/mage/target/integtest/integtest.go | 4 +- dev-tools/mage/target/pkg/test.go | 2 +- dev-tools/mage/target/unittest/unittest.go | 4 +- dev-tools/magefile.go | 2 +- dev-tools/make/mage.mk | 4 +- .../packaging/preference-pane/magefile.go | 2 +- .../templates/common/magefile.go.tmpl | 2 +- docs/devguide/contributing.asciidoc | 16 +- filebeat/autodiscover/autodiscover.go | 8 +- filebeat/autodiscover/builder/hints/config.go | 2 +- filebeat/autodiscover/builder/hints/logs.go | 16 +- .../autodiscover/builder/hints/logs_test.go | 6 +- filebeat/autodiscover/include.go | 2 +- filebeat/beater/acker.go | 4 +- filebeat/beater/acker_test.go | 2 +- filebeat/beater/channels.go | 6 +- filebeat/beater/filebeat.go | 40 +- filebeat/beater/signalwait.go | 2 +- filebeat/channel/connector.go | 10 +- filebeat/channel/connector_test.go | 8 +- filebeat/channel/factory.go | 8 +- filebeat/channel/interface.go | 4 +- filebeat/channel/outlet.go | 4 +- filebeat/channel/util.go | 2 +- filebeat/channel/util_test.go | 4 +- filebeat/cmd/generate.go | 10 +- filebeat/cmd/modules.go | 6 +- filebeat/cmd/root.go | 10 +- filebeat/config/config.go | 12 +- filebeat/config/config_test.go | 4 +- filebeat/crawler/crawler.go | 22 +- filebeat/fileset/config.go | 6 +- filebeat/fileset/config_test.go | 2 +- filebeat/fileset/factory.go | 18 +- filebeat/fileset/fileset.go | 8 +- filebeat/fileset/fileset_test.go | 2 +- filebeat/fileset/flags.go | 2 +- filebeat/fileset/modules.go | 10 +- filebeat/fileset/modules_integration_test.go | 4 +- filebeat/fileset/modules_test.go | 4 +- filebeat/fileset/pipelines.go | 4 +- filebeat/fileset/pipelines_test.go | 4 +- filebeat/fileset/setup.go | 8 +- filebeat/generator/fileset/fileset.go | 2 +- filebeat/generator/module/module.go | 2 +- filebeat/harvester/forwarder.go | 4 +- filebeat/harvester/registry.go | 2 +- filebeat/harvester/util.go | 2 +- filebeat/harvester/util_test.go | 4 +- filebeat/include/fields.go | 2 +- filebeat/include/list.go | 58 +- filebeat/input/config.go | 4 +- filebeat/input/container/input.go | 8 +- filebeat/input/docker/input.go | 12 +- filebeat/input/file/file.go | 2 +- filebeat/input/file/state.go | 2 +- filebeat/input/file/states.go | 2 +- filebeat/input/input.go | 10 +- filebeat/input/kafka/config.go | 12 +- filebeat/input/kafka/input.go | 14 +- .../input/kafka/kafka_integration_test.go | 12 +- filebeat/input/log/config.go | 18 +- filebeat/input/log/config_test.go | 2 +- filebeat/input/log/file.go | 2 +- filebeat/input/log/harvester.go | 30 +- filebeat/input/log/harvester_test.go | 8 +- filebeat/input/log/input.go | 18 +- filebeat/input/log/input_other_test.go | 4 +- filebeat/input/log/input_test.go | 14 +- filebeat/input/log/log.go | 6 +- filebeat/input/log/prospector_windows_test.go | 2 +- filebeat/input/mqtt/client.go | 2 +- filebeat/input/mqtt/client_mocked.go | 8 +- filebeat/input/mqtt/config.go | 2 +- filebeat/input/mqtt/input.go | 12 +- filebeat/input/mqtt/input_test.go | 10 +- filebeat/input/mqtt/logging.go | 2 +- filebeat/input/mqtt/mqtt_integration_test.go | 10 +- filebeat/input/plugin.go | 2 +- filebeat/input/redis/config.go | 2 +- filebeat/input/redis/harvester.go | 8 +- filebeat/input/redis/input.go | 16 +- filebeat/input/registry.go | 8 +- filebeat/input/registry_test.go | 4 +- filebeat/input/runnerfactory.go | 10 +- filebeat/input/stdin/input.go | 16 +- filebeat/input/syslog/config.go | 10 +- filebeat/input/syslog/input.go | 18 +- filebeat/input/syslog/input_test.go | 6 +- filebeat/input/tcp/config.go | 4 +- filebeat/input/tcp/input.go | 16 +- filebeat/input/tcp/input_test.go | 2 +- filebeat/input/udp/config.go | 4 +- filebeat/input/udp/input.go | 16 +- filebeat/inputsource/tcp/config.go | 4 +- filebeat/inputsource/tcp/handler.go | 6 +- filebeat/inputsource/tcp/server.go | 8 +- filebeat/inputsource/tcp/server_test.go | 4 +- filebeat/inputsource/udp/config.go | 2 +- filebeat/inputsource/udp/server.go | 4 +- filebeat/inputsource/udp/server_test.go | 2 +- filebeat/magefile.go | 8 +- filebeat/main.go | 2 +- filebeat/main_test.go | 4 +- filebeat/module/apache/fields.go | 2 +- filebeat/module/auditd/fields.go | 2 +- filebeat/module/elasticsearch/fields.go | 2 +- filebeat/module/haproxy/fields.go | 2 +- filebeat/module/icinga/fields.go | 2 +- filebeat/module/iis/fields.go | 2 +- filebeat/module/kafka/fields.go | 2 +- filebeat/module/kibana/fields.go | 2 +- filebeat/module/logstash/fields.go | 2 +- filebeat/module/mongodb/fields.go | 2 +- filebeat/module/mysql/fields.go | 2 +- filebeat/module/nats/fields.go | 2 +- filebeat/module/nginx/fields.go | 2 +- filebeat/module/osquery/fields.go | 2 +- filebeat/module/postgresql/fields.go | 2 +- filebeat/module/redis/fields.go | 2 +- filebeat/module/santa/fields.go | 2 +- filebeat/module/system/fields.go | 2 +- filebeat/module/traefik/fields.go | 2 +- .../add_kubernetes_metadata/matchers.go | 6 +- .../add_kubernetes_metadata/matchers_test.go | 2 +- filebeat/registrar/migrate.go | 4 +- filebeat/registrar/registrar.go | 12 +- filebeat/registrar/registrar_test.go | 2 +- filebeat/scripts/mage/config.go | 2 +- filebeat/scripts/mage/docs.go | 2 +- filebeat/scripts/mage/generate/fields.go | 4 +- filebeat/scripts/mage/generate/fileset.go | 4 +- filebeat/scripts/mage/generate/module.go | 4 +- filebeat/scripts/mage/package.go | 2 +- filebeat/scripts/tester/main.go | 12 +- generator/{ => _templates}/beat/.gitignore | 0 generator/{ => _templates}/beat/CHANGELOG.md | 0 generator/_templates/beat/Makefile | 1 + generator/{ => _templates}/beat/README.md | 0 .../beat/{beat}/.editorconfig | 0 .../{ => _templates}/beat/{beat}/.gitignore | 0 .../{ => _templates}/beat/{beat}/.travis.yml | 0 .../beat/{beat}/CONTRIBUTING.md | 0 .../{ => _templates}/beat/{beat}/LICENSE.txt | 0 .../{ => _templates}/beat/{beat}/Makefile | 0 .../{ => _templates}/beat/{beat}/NOTICE.txt | 0 .../{ => _templates}/beat/{beat}/README.md | 0 .../beat/{beat}/_meta/beat.docker.yml | 0 .../beat/{beat}/_meta/beat.yml | 0 .../beat/{beat}/_meta/fields.yml | 0 .../beat/{beat}/beater/{beat}.go | 6 +- generator/_templates/beat/{beat}/cmd/root.go | 14 + .../beat/{beat}/config/config.go | 0 .../beat/{beat}/config/config_test.go | 0 .../beat/{beat}/docs/index.asciidoc | 0 generator/_templates/beat/{beat}/magefile.go | 102 + .../{ => _templates}/beat/{beat}/main.go | 0 .../{ => _templates}/beat/{beat}/main_test.go | 0 .../{ => _templates}/beat/{beat}/make.bat | 0 .../{beat}/tests/system/config/{beat}.yml.j2 | 0 .../beat/{beat}/tests/system/requirements.txt | 0 .../beat/{beat}/tests/system/test_base.py | 0 .../beat/{beat}/tests/system/{beat}.py | 0 .../{ => _templates}/metricbeat/.gitignore | 0 .../{ => _templates}/metricbeat/CHANGELOG.md | 0 generator/{ => _templates}/metricbeat/LICENSE | 0 generator/_templates/metricbeat/Makefile | 7 + .../{ => _templates}/metricbeat/README.md | 0 .../metricbeat/{beat}/.editorconfig | 0 .../metricbeat/{beat}/.gitignore | 0 .../metricbeat/{beat}/CONTRIBUTING.md | 0 .../metricbeat/{beat}/LICENSE.txt | 0 .../metricbeat/{beat}/Makefile | 0 .../metricbeat/{beat}/NOTICE.txt | 0 .../metricbeat/{beat}/README.md | 0 .../metricbeat/{beat}/_meta/docker.yml | 0 .../metricbeat/{beat}/_meta/reference.yml | 0 .../metricbeat/{beat}/_meta/short.yml | 0 .../metricbeat/{beat}/cmd/modules.go | 48 + .../_templates/metricbeat/{beat}/cmd/root.go | 50 + .../_templates/metricbeat/{beat}/magefile.go | 137 + .../metricbeat/{beat}/main.go | 0 .../metricbeat/{beat}/make.bat | 0 generator/beat/Makefile | 1 - generator/beat/{beat}/cmd/root.go | 14 - generator/beat/{beat}/magefile.go | 101 - generator/common/beatgen/beatgen.go | 4 +- generator/common/beatgen/setup/creator.go | 2 +- generator/common/beatgen/setup/setup.go | 2 +- generator/metricbeat/Makefile | 7 - generator/metricbeat/{beat}/cmd/modules.go | 48 - generator/metricbeat/{beat}/cmd/root.go | 50 - generator/metricbeat/{beat}/magefile.go | 137 - go.mod | 171 + go.sum | 876 + .../autodiscover/builder/hints/monitors.go | 12 +- .../builder/hints/monitors_test.go | 6 +- heartbeat/autodiscover/include.go | 2 +- heartbeat/beater/heartbeat.go | 22 +- heartbeat/cmd/root.go | 12 +- heartbeat/config/config.go | 4 +- heartbeat/eventext/eventext.go | 4 +- heartbeat/hbregistry/hbregistry.go | 2 +- heartbeat/hbtest/hbtestutil.go | 6 +- heartbeat/include/fields.go | 2 +- heartbeat/look/look.go | 4 +- heartbeat/look/look_test.go | 4 +- heartbeat/magefile.go | 14 +- heartbeat/main.go | 4 +- heartbeat/main_test.go | 4 +- .../monitors/active/dialchain/builder.go | 10 +- .../monitors/active/dialchain/dialchain.go | 4 +- heartbeat/monitors/active/dialchain/net.go | 12 +- heartbeat/monitors/active/dialchain/socks5.go | 6 +- heartbeat/monitors/active/dialchain/tls.go | 8 +- .../monitors/active/dialchain/tls_test.go | 2 +- heartbeat/monitors/active/dialchain/util.go | 4 +- heartbeat/monitors/active/http/check.go | 10 +- heartbeat/monitors/active/http/check_test.go | 6 +- heartbeat/monitors/active/http/config.go | 8 +- heartbeat/monitors/active/http/http.go | 14 +- heartbeat/monitors/active/http/http_test.go | 16 +- heartbeat/monitors/active/http/respbody.go | 4 +- .../monitors/active/http/respbody_test.go | 2 +- .../monitors/active/http/simple_transp.go | 2 +- heartbeat/monitors/active/http/task.go | 22 +- heartbeat/monitors/active/http/task_test.go | 2 +- heartbeat/monitors/active/icmp/config.go | 2 +- heartbeat/monitors/active/icmp/icmp.go | 16 +- heartbeat/monitors/active/tcp/config.go | 6 +- heartbeat/monitors/active/tcp/task.go | 12 +- heartbeat/monitors/active/tcp/tcp.go | 16 +- heartbeat/monitors/active/tcp/tcp_test.go | 12 +- heartbeat/monitors/defaults/default.go | 6 +- heartbeat/monitors/factory.go | 8 +- heartbeat/monitors/jobs/job.go | 2 +- heartbeat/monitors/jobs/job_test.go | 6 +- heartbeat/monitors/jobs/testing.go | 2 +- heartbeat/monitors/mocks_test.go | 14 +- heartbeat/monitors/monitor.go | 14 +- heartbeat/monitors/monitor_test.go | 4 +- heartbeat/monitors/plugin.go | 8 +- heartbeat/monitors/pluginconf.go | 4 +- heartbeat/monitors/regrecord.go | 2 +- heartbeat/monitors/task.go | 16 +- heartbeat/monitors/task_test.go | 8 +- heartbeat/monitors/util.go | 12 +- heartbeat/monitors/wrappers/monitors.go | 14 +- heartbeat/monitors/wrappers/monitors_test.go | 12 +- heartbeat/monitors/wrappers/util.go | 8 +- heartbeat/monitors/wrappers/util_test.go | 2 +- heartbeat/reason/reason.go | 2 +- heartbeat/scheduler/schedule/schedule.go | 4 +- heartbeat/scheduler/schedule/schedule_test.go | 4 +- heartbeat/scheduler/scheduler.go | 8 +- heartbeat/scheduler/scheduler_test.go | 4 +- heartbeat/scripts/mage/config.go | 2 +- heartbeat/watcher/watcher.go | 2 +- journalbeat/beater/journalbeat.go | 20 +- journalbeat/checkpoint/checkpoint.go | 4 +- journalbeat/cmd/instance/metrics.go | 4 +- journalbeat/cmd/root.go | 10 +- journalbeat/config/config.go | 2 +- journalbeat/include/fields.go | 2 +- journalbeat/input/config.go | 8 +- journalbeat/input/input.go | 16 +- journalbeat/input/input_test.go | 8 +- journalbeat/magefile.go | 8 +- journalbeat/main.go | 2 +- journalbeat/main_test.go | 4 +- journalbeat/reader/config.go | 2 +- journalbeat/reader/fields.go | 2 +- journalbeat/reader/journal.go | 16 +- journalbeat/reader/journal_other.go | 6 +- journalbeat/reader/journal_test.go | 10 +- libbeat/api/make_listener_posix.go | 2 +- libbeat/api/make_listener_windows.go | 2 +- libbeat/api/routes.go | 6 +- libbeat/api/server.go | 4 +- libbeat/api/server_test.go | 2 +- libbeat/api/server_windows_test.go | 4 +- libbeat/asset/asset.go | 2 +- libbeat/autodiscover/appender.go | 4 +- libbeat/autodiscover/appender_test.go | 4 +- .../autodiscover/appenders/config/config.go | 14 +- .../appenders/config/config_test.go | 4 +- libbeat/autodiscover/appenders/registry.go | 4 +- libbeat/autodiscover/autodiscover.go | 14 +- libbeat/autodiscover/autodiscover_test.go | 10 +- libbeat/autodiscover/builder.go | 4 +- libbeat/autodiscover/builder/helper.go | 6 +- libbeat/autodiscover/builder/helper_test.go | 2 +- libbeat/autodiscover/builder/plugin.go | 4 +- libbeat/autodiscover/builder_test.go | 4 +- libbeat/autodiscover/config.go | 2 +- libbeat/autodiscover/factoryadapter.go | 8 +- libbeat/autodiscover/meta/meta.go | 2 +- libbeat/autodiscover/meta/meta_test.go | 2 +- libbeat/autodiscover/provider.go | 6 +- .../autodiscover/providers/docker/config.go | 6 +- .../autodiscover/providers/docker/docker.go | 18 +- .../docker/docker_integration_test.go | 10 +- .../providers/docker/docker_test.go | 6 +- .../autodiscover/providers/jolokia/config.go | 4 +- .../providers/jolokia/config_test.go | 2 +- .../providers/jolokia/discovery.go | 10 +- .../autodiscover/providers/jolokia/jolokia.go | 8 +- .../providers/kubernetes/config.go | 10 +- .../providers/kubernetes/config_test.go | 6 +- .../providers/kubernetes/kubernetes.go | 14 +- .../autodiscover/providers/kubernetes/node.go | 14 +- .../providers/kubernetes/node_test.go | 12 +- .../autodiscover/providers/kubernetes/pod.go | 14 +- .../providers/kubernetes/pod_test.go | 12 +- .../providers/kubernetes/service.go | 14 +- .../providers/kubernetes/service_test.go | 12 +- libbeat/autodiscover/providers/plugin.go | 4 +- libbeat/autodiscover/registry.go | 2 +- libbeat/autodiscover/template/config.go | 8 +- libbeat/autodiscover/template/config_test.go | 4 +- libbeat/beat/beat.go | 4 +- libbeat/beat/event.go | 2 +- libbeat/beat/event_test.go | 2 +- libbeat/beat/pipeline.go | 2 +- libbeat/cfgfile/cfgfile.go | 4 +- libbeat/cfgfile/glob_watcher.go | 2 +- libbeat/cfgfile/list.go | 8 +- libbeat/cfgfile/list_test.go | 6 +- libbeat/cfgfile/reload.go | 12 +- libbeat/cfgfile/reload_test.go | 2 +- libbeat/cloudid/cloudid.go | 4 +- libbeat/cloudid/cloudid_test.go | 2 +- libbeat/cmd/completion.go | 2 +- libbeat/cmd/export.go | 4 +- libbeat/cmd/export/config.go | 4 +- libbeat/cmd/export/dashboard.go | 8 +- libbeat/cmd/export/export.go | 6 +- libbeat/cmd/export/ilm_policy.go | 6 +- libbeat/cmd/export/index_pattern.go | 6 +- libbeat/cmd/export/template.go | 6 +- libbeat/cmd/instance/beat.go | 58 +- libbeat/cmd/instance/beat_test.go | 2 +- libbeat/cmd/instance/imports_common.go | 36 +- libbeat/cmd/instance/imports_docker.go | 8 +- libbeat/cmd/instance/locker.go | 2 +- libbeat/cmd/instance/locker_test.go | 2 +- libbeat/cmd/instance/metrics.go | 10 +- libbeat/cmd/instance/metrics_common.go | 6 +- .../cmd/instance/metrics_file_descriptors.go | 4 +- libbeat/cmd/instance/metrics_handles.go | 4 +- libbeat/cmd/instance/metrics_other.go | 2 +- libbeat/cmd/instance/settings.go | 10 +- libbeat/cmd/keystore.go | 8 +- libbeat/cmd/modules.go | 6 +- libbeat/cmd/root.go | 6 +- libbeat/cmd/run.go | 4 +- libbeat/cmd/setup.go | 4 +- libbeat/cmd/test.go | 6 +- libbeat/cmd/test/config.go | 4 +- libbeat/cmd/test/output.go | 8 +- libbeat/cmd/version.go | 6 +- libbeat/common/bus/bus.go | 4 +- libbeat/common/bus/bus_test.go | 2 +- libbeat/common/cfgtype/byte_size.go | 2 +- libbeat/common/cfgwarn/cfgwarn.go | 2 +- libbeat/common/cfgwarn/removed.go | 2 +- libbeat/common/cfgwarn/removed_test.go | 2 +- libbeat/common/cleanup/cleanup_test.go | 2 +- libbeat/common/config.go | 4 +- libbeat/common/docker/client.go | 2 +- libbeat/common/docker/helpers.go | 4 +- libbeat/common/docker/watcher.go | 4 +- libbeat/common/docker/watcher_test.go | 2 +- libbeat/common/event.go | 2 +- libbeat/common/event_test.go | 2 +- libbeat/common/file/fileinfo_test.go | 2 +- libbeat/common/file/rotator_test.go | 4 +- libbeat/common/flowhash/examples/example.go | 2 +- libbeat/common/fmtstr/formatevents.go | 6 +- libbeat/common/fmtstr/formatevents_test.go | 4 +- libbeat/common/fmtstr/formattimestamp.go | 4 +- libbeat/common/fmtstr/formattimestamp_test.go | 2 +- libbeat/common/jsontransform/jsonhelper.go | 6 +- libbeat/common/jsontransform/transform.go | 2 +- libbeat/common/kubernetes/metadata/config.go | 2 +- .../common/kubernetes/metadata/metadata.go | 6 +- .../common/kubernetes/metadata/namespace.go | 4 +- .../kubernetes/metadata/namespace_test.go | 4 +- libbeat/common/kubernetes/metadata/node.go | 4 +- .../common/kubernetes/metadata/node_test.go | 4 +- libbeat/common/kubernetes/metadata/pod.go | 4 +- .../common/kubernetes/metadata/pod_test.go | 4 +- .../common/kubernetes/metadata/resource.go | 6 +- .../kubernetes/metadata/resource_test.go | 4 +- libbeat/common/kubernetes/metadata/service.go | 4 +- .../kubernetes/metadata/service_test.go | 4 +- libbeat/common/kubernetes/util.go | 2 +- libbeat/common/kubernetes/watcher.go | 2 +- libbeat/common/mapstr_test.go | 2 +- libbeat/common/reload/reload.go | 2 +- libbeat/common/safemapstr/safemapstr.go | 2 +- libbeat/common/safemapstr/safemapstr_test.go | 2 +- .../common/schema/mapstriface/mapstriface.go | 6 +- .../schema/mapstriface/mapstriface_test.go | 4 +- libbeat/common/schema/mapstrstr/mapstrstr.go | 4 +- .../common/schema/mapstrstr/mapstrstr_test.go | 4 +- libbeat/common/schema/options.go | 2 +- libbeat/common/schema/options_test.go | 2 +- libbeat/common/schema/schema.go | 4 +- libbeat/common/schema/schema_test.go | 2 +- libbeat/common/seccomp/seccomp.go | 4 +- libbeat/common/streambuf/net.go | 2 +- .../transport/tlscommon/ca_pinning_test.go | 2 +- .../transport/tlscommon/server_config.go | 2 +- libbeat/common/transport/tlscommon/tls.go | 2 +- .../common/transport/tlscommon/tls_config.go | 2 +- .../common/transport/tlscommon/tls_test.go | 2 +- libbeat/common/useragent/useragent.go | 2 +- libbeat/conditions/and_test.go | 2 +- libbeat/conditions/conditions.go | 4 +- .../conditions/conditions_benchmarks_test.go | 4 +- libbeat/conditions/conditions_test.go | 6 +- libbeat/conditions/equals.go | 2 +- libbeat/conditions/matcher.go | 4 +- libbeat/conditions/matcher_test.go | 6 +- libbeat/conditions/network.go | 4 +- libbeat/conditions/network_test.go | 4 +- libbeat/conditions/not_test.go | 2 +- libbeat/conditions/or_test.go | 2 +- libbeat/conditions/range.go | 4 +- libbeat/conditions/range_test.go | 4 +- libbeat/dashboards/dashboards.go | 4 +- libbeat/dashboards/decode.go | 4 +- libbeat/dashboards/export.go | 4 +- libbeat/dashboards/importer.go | 2 +- libbeat/dashboards/kibana_loader.go | 6 +- libbeat/dashboards/modify_json.go | 4 +- libbeat/dashboards/modify_json_test.go | 2 +- libbeat/feature/registry.go | 2 +- libbeat/idxmgmt/client_handler.go | 6 +- libbeat/idxmgmt/idxmgmt.go | 12 +- libbeat/idxmgmt/ilm/client_handler.go | 2 +- .../ilm/client_handler_integration_test.go | 10 +- libbeat/idxmgmt/ilm/config.go | 6 +- libbeat/idxmgmt/ilm/ilm.go | 8 +- libbeat/idxmgmt/ilm/ilm_test.go | 4 +- libbeat/idxmgmt/ilm/noop.go | 4 +- libbeat/idxmgmt/ilm/std.go | 2 +- libbeat/idxmgmt/mockilm_test.go | 8 +- libbeat/idxmgmt/std.go | 16 +- libbeat/idxmgmt/std_test.go | 10 +- libbeat/keystore/file_keystore.go | 4 +- libbeat/keystore/file_keystore_test.go | 2 +- libbeat/keystore/keystore.go | 2 +- libbeat/kibana/client.go | 8 +- libbeat/kibana/client_config.go | 2 +- libbeat/kibana/dashboard.go | 2 +- libbeat/kibana/fields_transformer.go | 4 +- libbeat/kibana/fields_transformer_test.go | 4 +- libbeat/kibana/index_pattern_generator.go | 4 +- .../kibana/index_pattern_generator_test.go | 2 +- libbeat/kibana/transformer.go | 2 +- libbeat/libbeat.go | 4 +- libbeat/libbeat_test.go | 2 +- libbeat/logp/configure/logging.go | 4 +- libbeat/logp/core.go | 4 +- libbeat/magefile.go | 6 +- libbeat/management/management.go | 6 +- libbeat/mapping/field_test.go | 2 +- libbeat/metric/system/cpu/cpu.go | 2 +- libbeat/metric/system/host/host.go | 4 +- libbeat/metric/system/memory/memory.go | 4 +- libbeat/metric/system/process/process.go | 8 +- libbeat/metric/system/process/process_test.go | 2 +- libbeat/ml-importer/importer.go | 4 +- .../ml-importer/importer_integration_test.go | 4 +- libbeat/mock/mockbeat.go | 8 +- libbeat/monitoring/adapter/filters.go | 4 +- .../monitoring/adapter/go-metrics-wrapper.go | 2 +- libbeat/monitoring/adapter/go-metrics.go | 4 +- libbeat/monitoring/adapter/go-metrics_test.go | 2 +- libbeat/monitoring/cloudid.go | 4 +- libbeat/monitoring/cloudid_test.go | 2 +- libbeat/monitoring/metrics.go | 4 +- libbeat/monitoring/monitoring.go | 6 +- .../monitoring/report/elasticsearch/client.go | 12 +- .../monitoring/report/elasticsearch/config.go | 4 +- .../report/elasticsearch/elasticsearch.go | 28 +- .../report/elasticsearch/snapshot.go | 4 +- libbeat/monitoring/report/event.go | 2 +- libbeat/monitoring/report/log/log.go | 10 +- libbeat/monitoring/report/log/log_test.go | 8 +- libbeat/monitoring/report/report.go | 4 +- libbeat/outputs/backoff.go | 6 +- libbeat/outputs/codec/codec.go | 2 +- libbeat/outputs/codec/codec_reg.go | 4 +- libbeat/outputs/codec/common.go | 4 +- libbeat/outputs/codec/format/format.go | 8 +- libbeat/outputs/codec/format/format_test.go | 6 +- libbeat/outputs/codec/json/event.go | 4 +- libbeat/outputs/codec/json/json.go | 6 +- libbeat/outputs/codec/json/json_bench_test.go | 4 +- libbeat/outputs/codec/json/json_test.go | 4 +- libbeat/outputs/codec/plugin.go | 2 +- libbeat/outputs/console/config.go | 2 +- libbeat/outputs/console/console.go | 14 +- libbeat/outputs/console/console_test.go | 18 +- libbeat/outputs/elasticsearch/api.go | 2 +- .../elasticsearch/api_integration_test.go | 2 +- .../outputs/elasticsearch/api_mock_test.go | 2 +- libbeat/outputs/elasticsearch/api_test.go | 4 +- libbeat/outputs/elasticsearch/bulkapi.go | 2 +- .../elasticsearch/bulkapi_integration_test.go | 2 +- .../elasticsearch/bulkapi_mock_test.go | 2 +- libbeat/outputs/elasticsearch/client.go | 16 +- .../elasticsearch/client_integration_test.go | 16 +- .../elasticsearch/client_proxy_test.go | 4 +- libbeat/outputs/elasticsearch/client_test.go | 16 +- libbeat/outputs/elasticsearch/config.go | 2 +- .../outputs/elasticsearch/elasticsearch.go | 12 +- libbeat/outputs/elasticsearch/enc.go | 6 +- libbeat/outputs/elasticsearch/enc_test.go | 6 +- .../outputs/elasticsearch/estest/estest.go | 6 +- libbeat/outputs/elasticsearch/json_read.go | 2 +- libbeat/outputs/failover.go | 4 +- libbeat/outputs/fileout/config.go | 4 +- libbeat/outputs/fileout/file.go | 14 +- libbeat/outputs/hosts.go | 2 +- libbeat/outputs/kafka/client.go | 16 +- libbeat/outputs/kafka/config.go | 18 +- libbeat/outputs/kafka/config_test.go | 2 +- libbeat/outputs/kafka/kafka.go | 12 +- .../outputs/kafka/kafka_integration_test.go | 16 +- libbeat/outputs/kafka/log.go | 2 +- libbeat/outputs/kafka/message.go | 2 +- libbeat/outputs/kafka/partition.go | 4 +- libbeat/outputs/kafka/partition_test.go | 6 +- libbeat/outputs/logstash/async.go | 12 +- libbeat/outputs/logstash/async_test.go | 8 +- libbeat/outputs/logstash/client_test.go | 10 +- libbeat/outputs/logstash/common_test.go | 2 +- libbeat/outputs/logstash/config.go | 10 +- libbeat/outputs/logstash/config_test.go | 4 +- libbeat/outputs/logstash/enc.go | 4 +- libbeat/outputs/logstash/logstash.go | 12 +- .../logstash/logstash_integration_test.go | 16 +- libbeat/outputs/logstash/logstash_test.go | 10 +- libbeat/outputs/logstash/sync.go | 10 +- libbeat/outputs/logstash/sync_test.go | 10 +- libbeat/outputs/metrics.go | 2 +- libbeat/outputs/outest/batch.go | 4 +- libbeat/outputs/outil/select.go | 8 +- libbeat/outputs/outil/select_test.go | 4 +- libbeat/outputs/output_reg.go | 4 +- libbeat/outputs/outputs.go | 2 +- libbeat/outputs/plugin.go | 2 +- libbeat/outputs/redis/backoff.go | 4 +- libbeat/outputs/redis/client.go | 16 +- libbeat/outputs/redis/config.go | 6 +- libbeat/outputs/redis/redis.go | 18 +- .../outputs/redis/redis_integration_test.go | 12 +- libbeat/outputs/redis/redis_test.go | 8 +- libbeat/outputs/tls.go | 2 +- libbeat/outputs/transport/client.go | 2 +- libbeat/outputs/transport/proxy.go | 2 +- libbeat/outputs/transport/tcp.go | 4 +- libbeat/outputs/transport/tls.go | 4 +- libbeat/outputs/transport/transport.go | 2 +- .../outputs/transport/transptest/testing.go | 4 +- .../transport/transptest/testing_test.go | 2 +- libbeat/plugin/cli.go | 4 +- libbeat/processors/actions/add_fields.go | 10 +- libbeat/processors/actions/add_fields_test.go | 2 +- libbeat/processors/actions/add_labels.go | 6 +- libbeat/processors/actions/add_labels_test.go | 2 +- libbeat/processors/actions/add_tags.go | 8 +- libbeat/processors/actions/add_tags_test.go | 2 +- libbeat/processors/actions/common_test.go | 6 +- libbeat/processors/actions/copy_fields.go | 12 +- .../processors/actions/copy_fields_test.go | 4 +- .../processors/actions/decode_base64_field.go | 12 +- .../actions/decode_base64_field_test.go | 6 +- .../processors/actions/decode_json_fields.go | 14 +- .../actions/decode_json_fields_test.go | 6 +- .../actions/decompress_gzip_field.go | 10 +- .../actions/decompress_gzip_field_test.go | 6 +- libbeat/processors/actions/drop_event.go | 8 +- libbeat/processors/actions/drop_fields.go | 8 +- libbeat/processors/actions/extract_field.go | 6 +- .../processors/actions/extract_field_test.go | 6 +- libbeat/processors/actions/include_fields.go | 8 +- .../processors/actions/include_fields_test.go | 4 +- libbeat/processors/actions/rename.go | 12 +- libbeat/processors/actions/rename_test.go | 4 +- libbeat/processors/actions/truncate_fields.go | 12 +- .../actions/truncate_fields_test.go | 4 +- .../add_cloud_metadata/add_cloud_metadata.go | 10 +- .../add_cloud_metadata/http_fetcher.go | 2 +- .../provider_alibaba_cloud.go | 2 +- .../provider_alibaba_cloud_test.go | 6 +- .../add_cloud_metadata/provider_aws_ec2.go | 6 +- .../provider_aws_ec2_test.go | 6 +- .../add_cloud_metadata/provider_azure_vm.go | 6 +- .../provider_azure_vm_test.go | 6 +- .../provider_digital_ocean.go | 6 +- .../provider_digital_ocean_test.go | 6 +- .../add_cloud_metadata/provider_google_gce.go | 6 +- .../provider_google_gce_test.go | 6 +- .../provider_openstack_nova.go | 2 +- .../provider_openstack_nova_test.go | 6 +- .../provider_tencent_cloud.go | 2 +- .../provider_tencent_cloud_test.go | 6 +- .../add_cloud_metadata/providers.go | 2 +- .../add_cloud_metadata/providers_test.go | 2 +- .../add_docker_metadata.go | 16 +- .../add_docker_metadata_test.go | 10 +- .../processors/add_docker_metadata/config.go | 2 +- .../add_formatted_index.go | 6 +- .../add_host_metadata/add_host_metadata.go | 14 +- .../add_host_metadata_test.go | 4 +- .../processors/add_host_metadata/config.go | 2 +- libbeat/processors/add_id/add_id.go | 10 +- libbeat/processors/add_id/add_id_test.go | 4 +- libbeat/processors/add_id/config.go | 2 +- .../add_kubernetes_metadata/cache.go | 2 +- .../add_kubernetes_metadata/config.go | 2 +- .../add_kubernetes_metadata/indexers.go | 8 +- .../add_kubernetes_metadata/indexers_test.go | 6 +- .../add_kubernetes_metadata/indexing.go | 2 +- .../add_kubernetes_metadata/kubernetes.go | 14 +- .../kubernetes_test.go | 4 +- .../add_kubernetes_metadata/matchers.go | 12 +- .../add_kubernetes_metadata/matchers_test.go | 2 +- .../add_kubernetes_metadata/registry.go | 2 +- libbeat/processors/add_locale/add_locale.go | 8 +- .../processors/add_locale/add_locale_test.go | 6 +- .../add_observer_metadata.go | 12 +- .../add_observer_metadata_test.go | 4 +- .../add_observer_metadata/config.go | 2 +- .../add_process_metadata.go | 12 +- .../add_process_metadata_test.go | 6 +- .../processors/add_process_metadata/config.go | 2 +- libbeat/processors/checks/checks.go | 4 +- libbeat/processors/checks/checks_test.go | 6 +- libbeat/processors/communityid/communityid.go | 12 +- .../communityid/communityid_test.go | 4 +- libbeat/processors/conditionals.go | 6 +- libbeat/processors/conditionals_test.go | 4 +- libbeat/processors/config.go | 2 +- libbeat/processors/convert/convert.go | 10 +- libbeat/processors/convert/convert_test.go | 4 +- .../decode_csv_fields/decode_csv_fields.go | 10 +- .../decode_csv_fields_test.go | 4 +- libbeat/processors/dissect/config_test.go | 2 +- libbeat/processors/dissect/processor.go | 8 +- libbeat/processors/dissect/processor_test.go | 4 +- libbeat/processors/dns/cache.go | 2 +- libbeat/processors/dns/cache_test.go | 2 +- libbeat/processors/dns/config.go | 2 +- libbeat/processors/dns/dns.go | 14 +- libbeat/processors/dns/dns_test.go | 8 +- libbeat/processors/dns/resolver.go | 4 +- libbeat/processors/dns/resolver_test.go | 2 +- .../processors/extract_array/extract_array.go | 10 +- .../extract_array/extract_array_test.go | 4 +- libbeat/processors/fingerprint/fingerprint.go | 8 +- .../fingerprint/fingerprint_test.go | 4 +- libbeat/processors/fingerprint/hash.go | 2 +- libbeat/processors/namespace.go | 2 +- libbeat/processors/namespace_test.go | 4 +- libbeat/processors/processor.go | 6 +- libbeat/processors/processor_test.go | 12 +- .../registered_domain/registered_domain.go | 12 +- .../registered_domain_test.go | 4 +- libbeat/processors/registry.go | 6 +- .../script/javascript/beatevent_v0.go | 4 +- .../script/javascript/beatevent_v0_test.go | 8 +- .../script/javascript/javascript.go | 12 +- .../javascript/module/console/console.go | 2 +- .../javascript/module/console/console_test.go | 10 +- .../script/javascript/module/include.go | 10 +- .../script/javascript/module/net/net_test.go | 10 +- .../javascript/module/path/path_test.go | 10 +- .../javascript/module/processor/chain.go | 6 +- .../javascript/module/processor/processor.go | 6 +- .../module/processor/processor_test.go | 12 +- .../javascript/module/require/require.go | 2 +- .../processors/script/javascript/session.go | 6 +- .../script/javascript/session_test.go | 6 +- libbeat/processors/script/processor.go | 8 +- libbeat/processors/timeseries/timeseries.go | 10 +- .../processors/timeseries/timeseries_test.go | 6 +- libbeat/processors/timestamp/timestamp.go | 10 +- .../processors/timestamp/timestamp_test.go | 6 +- libbeat/processors/util/geo.go | 2 +- libbeat/processors/util/geo_test.go | 2 +- libbeat/publisher/event.go | 4 +- libbeat/publisher/includes/includes.go | 20 +- libbeat/publisher/pipeline/acker.go | 4 +- libbeat/publisher/pipeline/batch.go | 4 +- libbeat/publisher/pipeline/client.go | 10 +- libbeat/publisher/pipeline/client_ack.go | 4 +- libbeat/publisher/pipeline/client_test.go | 10 +- libbeat/publisher/pipeline/config.go | 6 +- libbeat/publisher/pipeline/consumer.go | 6 +- libbeat/publisher/pipeline/controller.go | 10 +- libbeat/publisher/pipeline/module.go | 14 +- libbeat/publisher/pipeline/monitoring.go | 2 +- libbeat/publisher/pipeline/output.go | 6 +- libbeat/publisher/pipeline/pipeline.go | 18 +- libbeat/publisher/pipeline/pipeline_ack.go | 2 +- libbeat/publisher/pipeline/pipeline_test.go | 6 +- libbeat/publisher/pipeline/retry.go | 2 +- libbeat/publisher/pipeline/stress/gen.go | 8 +- libbeat/publisher/pipeline/stress/out.go | 8 +- libbeat/publisher/pipeline/stress/run.go | 12 +- libbeat/publisher/pipeline/stress/sig.go | 2 +- .../publisher/pipeline/stress/stress_test.go | 10 +- libbeat/publisher/processing/default.go | 16 +- libbeat/publisher/processing/default_test.go | 8 +- libbeat/publisher/processing/processing.go | 6 +- libbeat/publisher/processing/processors.go | 10 +- libbeat/publisher/queue/memqueue/batchbuf.go | 2 +- libbeat/publisher/queue/memqueue/broker.go | 8 +- libbeat/publisher/queue/memqueue/consume.go | 6 +- .../publisher/queue/memqueue/internal_api.go | 2 +- libbeat/publisher/queue/memqueue/produce.go | 8 +- .../publisher/queue/memqueue/queue_test.go | 4 +- libbeat/publisher/queue/memqueue/ringbuf.go | 2 +- libbeat/publisher/queue/queue.go | 8 +- libbeat/publisher/queue/queue_reg.go | 2 +- libbeat/publisher/queue/queuetest/event.go | 6 +- libbeat/publisher/queue/queuetest/log.go | 2 +- .../queue/queuetest/producer_cancel.go | 6 +- .../publisher/queue/queuetest/queuetest.go | 4 +- libbeat/publisher/queue/spool/codec.go | 8 +- libbeat/publisher/queue/spool/codec_test.go | 6 +- libbeat/publisher/queue/spool/config.go | 2 +- libbeat/publisher/queue/spool/consume.go | 6 +- libbeat/publisher/queue/spool/inbroker.go | 2 +- libbeat/publisher/queue/spool/internal_api.go | 2 +- libbeat/publisher/queue/spool/log.go | 2 +- libbeat/publisher/queue/spool/module.go | 12 +- libbeat/publisher/queue/spool/outbroker.go | 2 +- libbeat/publisher/queue/spool/produce.go | 8 +- libbeat/publisher/queue/spool/spool.go | 4 +- libbeat/publisher/queue/spool/spool_test.go | 4 +- libbeat/publisher/testing/testing.go | 2 +- libbeat/publisher/testing/testing_test.go | 4 +- libbeat/reader/debug/debug.go | 2 +- libbeat/reader/debug/debug_test.go | 4 +- libbeat/reader/message.go | 2 +- libbeat/reader/multiline/multiline.go | 8 +- libbeat/reader/multiline/multiline_config.go | 2 +- libbeat/reader/multiline/multiline_test.go | 8 +- libbeat/reader/readfile/encode.go | 4 +- libbeat/reader/readfile/encode_test.go | 2 +- libbeat/reader/readfile/limit.go | 2 +- libbeat/reader/readfile/limit_test.go | 2 +- libbeat/reader/readfile/line.go | 4 +- libbeat/reader/readfile/line_test.go | 2 +- libbeat/reader/readfile/strip_newline.go | 2 +- libbeat/reader/readfile/timeout.go | 2 +- libbeat/reader/readjson/docker_json.go | 6 +- libbeat/reader/readjson/docker_json_test.go | 4 +- libbeat/reader/readjson/json.go | 10 +- libbeat/reader/readjson/json_test.go | 2 +- libbeat/scripts/Makefile | 57 +- libbeat/scripts/cmd/global_fields/main.go | 4 +- .../scripts/cmd/global_fields/main_test.go | 2 +- libbeat/scripts/cmd/stress_pipeline/main.go | 24 +- libbeat/service/service.go | 4 +- libbeat/service/service_windows.go | 2 +- libbeat/template/config.go | 2 +- libbeat/template/load.go | 8 +- libbeat/template/load_integration_test.go | 10 +- libbeat/template/load_test.go | 4 +- libbeat/template/processor.go | 4 +- libbeat/template/processor_test.go | 4 +- libbeat/template/template.go | 8 +- libbeat/template/template_test.go | 4 +- libbeat/tests/compose/project.go | 2 +- libbeat/tests/compose/wrapper.go | 2 +- libbeat/tests/docker/docker.go | 2 +- libbeat/tests/system/template/template.go | 8 +- magefile.go | 21 +- metricbeat/Makefile | 4 +- .../appender/kubernetes/token/config.go | 2 +- .../appender/kubernetes/token/token.go | 12 +- .../appender/kubernetes/token/token_test.go | 4 +- .../autodiscover/builder/hints/config.go | 2 +- .../autodiscover/builder/hints/metrics.go | 14 +- .../builder/hints/metrics_test.go | 6 +- metricbeat/autodiscover/include.go | 4 +- metricbeat/beater/config.go | 4 +- metricbeat/beater/doc.go | 2 +- metricbeat/beater/metricbeat.go | 24 +- metricbeat/cmd/modules.go | 6 +- metricbeat/cmd/root.go | 14 +- metricbeat/cmd/test/modules.go | 8 +- metricbeat/helper/config.go | 2 +- metricbeat/helper/dialer/dialer.go | 2 +- metricbeat/helper/dialer/dialer_posix.go | 2 +- metricbeat/helper/dialer/dialer_windows.go | 4 +- metricbeat/helper/elastic/elastic.go | 6 +- metricbeat/helper/elastic/elastic_test.go | 2 +- metricbeat/helper/http.go | 8 +- metricbeat/helper/http_test.go | 4 +- metricbeat/helper/http_windows_test.go | 6 +- metricbeat/helper/privileges_windows.go | 2 +- metricbeat/helper/prometheus/hash.go | 4 +- .../helper/prometheus/hash_benchmark_test.go | 2 +- metricbeat/helper/prometheus/metric.go | 2 +- metricbeat/helper/prometheus/module.go | 4 +- metricbeat/helper/prometheus/prometheus.go | 8 +- .../helper/prometheus/prometheus_test.go | 6 +- metricbeat/helper/prometheus/ptest/ptest.go | 8 +- metricbeat/helper/server/http/config.go | 2 +- metricbeat/helper/server/http/http.go | 10 +- metricbeat/helper/server/http/http_test.go | 2 +- metricbeat/helper/server/server.go | 2 +- metricbeat/helper/server/tcp/tcp.go | 8 +- metricbeat/helper/server/tcp/tcp_test.go | 4 +- metricbeat/helper/server/udp/udp.go | 8 +- metricbeat/helper/server/udp/udp_test.go | 4 +- metricbeat/helper/socket/ptable_linux.go | 2 +- metricbeat/helper/windows/pdh/doc.go | 2 +- metricbeat/include/fields/fields.go | 2 +- metricbeat/include/list_common.go | 296 +- metricbeat/include/list_docker.go | 62 +- metricbeat/magefile.go | 24 +- metricbeat/main.go | 2 +- metricbeat/main_test.go | 4 +- metricbeat/mb/builders.go | 6 +- metricbeat/mb/event.go | 4 +- metricbeat/mb/event_test.go | 2 +- metricbeat/mb/example_metricset_test.go | 6 +- metricbeat/mb/example_module_test.go | 2 +- metricbeat/mb/lightmetricset.go | 4 +- metricbeat/mb/lightmetricset_test.go | 2 +- metricbeat/mb/lightmodules.go | 6 +- metricbeat/mb/lightmodules_test.go | 6 +- metricbeat/mb/mb.go | 8 +- metricbeat/mb/mb_test.go | 2 +- metricbeat/mb/module/configuration.go | 6 +- metricbeat/mb/module/connector.go | 10 +- metricbeat/mb/module/connector_test.go | 6 +- metricbeat/mb/module/doc.go | 2 +- metricbeat/mb/module/example_test.go | 10 +- metricbeat/mb/module/factory.go | 8 +- metricbeat/mb/module/options.go | 4 +- metricbeat/mb/module/options_test.go | 2 +- metricbeat/mb/module/publish.go | 2 +- metricbeat/mb/module/runner.go | 4 +- metricbeat/mb/module/runner_group_test.go | 2 +- metricbeat/mb/module/runner_test.go | 10 +- metricbeat/mb/module/testing.go | 6 +- metricbeat/mb/module/wrapper.go | 12 +- metricbeat/mb/module/wrapper_test.go | 6 +- metricbeat/mb/parse/hostparsers.go | 2 +- metricbeat/mb/parse/url.go | 4 +- metricbeat/mb/parse/url_test.go | 6 +- metricbeat/mb/registry.go | 4 +- metricbeat/mb/testing/data/data_test.go | 5 +- metricbeat/mb/testing/data_generator.go | 8 +- metricbeat/mb/testing/fetcher.go | 6 +- metricbeat/mb/testing/modules.go | 6 +- metricbeat/mb/testing/testdata.go | 12 +- metricbeat/module/aerospike/fields.go | 2 +- metricbeat/module/aerospike/namespace/data.go | 4 +- .../module/aerospike/namespace/namespace.go | 6 +- .../namespace/namespace_integration_test.go | 4 +- metricbeat/module/apache/fields.go | 2 +- metricbeat/module/apache/status/data.go | 6 +- metricbeat/module/apache/status/status.go | 8 +- .../apache/status/status_integration_test.go | 4 +- .../module/apache/status/status_test.go | 6 +- metricbeat/module/beat/beat.go | 6 +- .../module/beat/beat_integration_test.go | 10 +- metricbeat/module/beat/fields.go | 2 +- metricbeat/module/beat/metricset.go | 4 +- metricbeat/module/beat/state/data.go | 10 +- metricbeat/module/beat/state/data_test.go | 4 +- metricbeat/module/beat/state/data_xpack.go | 8 +- metricbeat/module/beat/state/state.go | 6 +- metricbeat/module/beat/stats/data.go | 10 +- metricbeat/module/beat/stats/data_test.go | 4 +- metricbeat/module/beat/stats/data_xpack.go | 8 +- metricbeat/module/beat/stats/stats.go | 6 +- .../module/ceph/cluster_disk/cluster_disk.go | 6 +- .../cluster_disk_integration_test.go | 4 +- .../ceph/cluster_disk/cluster_disk_test.go | 4 +- metricbeat/module/ceph/cluster_disk/data.go | 2 +- .../ceph/cluster_health/cluster_health.go | 6 +- .../cluster_health_integration_test.go | 4 +- .../cluster_health/cluster_health_test.go | 4 +- metricbeat/module/ceph/cluster_health/data.go | 2 +- .../ceph/cluster_status/cluster_status.go | 6 +- .../cluster_status_integration_test.go | 4 +- .../cluster_status/cluster_status_test.go | 4 +- metricbeat/module/ceph/cluster_status/data.go | 2 +- metricbeat/module/ceph/fields.go | 2 +- metricbeat/module/ceph/mgr/metricset.go | 4 +- .../module/ceph/mgr_cluster_disk/data.go | 4 +- .../ceph/mgr_cluster_disk/mgr_cluster_disk.go | 8 +- .../mgr_cluster_disk_integration_test.go | 6 +- .../mgr_cluster_disk/mgr_cluster_disk_test.go | 4 +- .../module/ceph/mgr_cluster_health/data.go | 4 +- .../mgr_cluster_health/mgr_cluster_health.go | 8 +- .../mgr_cluster_health_integration_test.go | 6 +- .../mgr_cluster_health_test.go | 4 +- metricbeat/module/ceph/mgr_osd_perf/data.go | 4 +- .../module/ceph/mgr_osd_perf/mgr_osd_perf.go | 6 +- .../mgr_osd_perf_integration_test.go | 6 +- .../ceph/mgr_osd_perf/mgr_osd_perf_test.go | 4 +- .../module/ceph/mgr_osd_pool_stats/data.go | 4 +- .../mgr_osd_pool_stats/mgr_osd_pool_stats.go | 6 +- .../mgr_osd_pool_stats_integration_test.go | 6 +- .../mgr_osd_pool_stats_test.go | 4 +- metricbeat/module/ceph/mgr_osd_tree/data.go | 4 +- .../module/ceph/mgr_osd_tree/mgr_osd_tree.go | 8 +- .../mgr_osd_tree_integration_test.go | 6 +- .../ceph/mgr_osd_tree/mgr_osd_tree_test.go | 4 +- metricbeat/module/ceph/mgr_pool_disk/data.go | 4 +- .../ceph/mgr_pool_disk/mgr_pool_disk.go | 8 +- .../mgr_pool_disk_integration_test.go | 6 +- .../ceph/mgr_pool_disk/mgr_pool_disk_test.go | 4 +- metricbeat/module/ceph/monitor_health/data.go | 2 +- .../ceph/monitor_health/monitor_health.go | 6 +- .../monitor_health/monitor_health_test.go | 6 +- metricbeat/module/ceph/osd_df/data.go | 2 +- metricbeat/module/ceph/osd_df/osd_df.go | 6 +- .../ceph/osd_df/osd_df_integration_test.go | 4 +- metricbeat/module/ceph/osd_df/osd_df_test.go | 2 +- metricbeat/module/ceph/osd_tree/data.go | 4 +- metricbeat/module/ceph/osd_tree/osd_tree.go | 6 +- .../osd_tree/osd_tree_integration_test.go | 4 +- .../module/ceph/osd_tree/osd_tree_test.go | 2 +- metricbeat/module/ceph/pool_disk/data.go | 4 +- metricbeat/module/ceph/pool_disk/pool_disk.go | 6 +- .../pool_disk/pool_disk_integration_test.go | 4 +- .../module/ceph/pool_disk/pool_disk_test.go | 4 +- metricbeat/module/consul/agent/agent.go | 8 +- .../consul/agent/agent_integration_test.go | 10 +- metricbeat/module/consul/agent/agent_test.go | 2 +- metricbeat/module/consul/agent/data.go | 2 +- .../consul/agent/data_integration_test.go | 6 +- metricbeat/module/consul/fields.go | 2 +- metricbeat/module/couchbase/bucket/bucket.go | 6 +- .../bucket/bucket_integration_test.go | 6 +- .../module/couchbase/bucket/bucket_test.go | 4 +- metricbeat/module/couchbase/bucket/data.go | 4 +- .../module/couchbase/cluster/cluster.go | 6 +- .../cluster/cluster_integration_test.go | 6 +- .../module/couchbase/cluster/cluster_test.go | 4 +- metricbeat/module/couchbase/cluster/data.go | 4 +- metricbeat/module/couchbase/fields.go | 2 +- metricbeat/module/couchbase/node/data.go | 4 +- metricbeat/module/couchbase/node/node.go | 6 +- .../couchbase/node/node_integration_test.go | 6 +- metricbeat/module/couchbase/node/node_test.go | 4 +- metricbeat/module/couchdb/fields.go | 2 +- metricbeat/module/couchdb/server/data.go | 4 +- metricbeat/module/couchdb/server/server.go | 6 +- .../couchdb/server/server_integration_test.go | 4 +- .../module/couchdb/server/server_test.go | 2 +- .../module/docker/container/container.go | 4 +- .../container/container_integration_test.go | 2 +- metricbeat/module/docker/container/data.go | 6 +- metricbeat/module/docker/cpu/cpu.go | 4 +- .../module/docker/cpu/cpu_integration_test.go | 2 +- metricbeat/module/docker/cpu/cpu_test.go | 4 +- metricbeat/module/docker/cpu/data.go | 4 +- metricbeat/module/docker/cpu/helper.go | 6 +- metricbeat/module/docker/diskio/data.go | 4 +- metricbeat/module/docker/diskio/diskio.go | 4 +- .../docker/diskio/diskio_integration_test.go | 2 +- .../module/docker/diskio/diskio_test.go | 2 +- metricbeat/module/docker/diskio/helper.go | 2 +- metricbeat/module/docker/docker.go | 6 +- metricbeat/module/docker/event/event.go | 8 +- .../docker/event/event_integration_test.go | 8 +- metricbeat/module/docker/fields.go | 2 +- metricbeat/module/docker/healthcheck/data.go | 6 +- .../module/docker/healthcheck/healthcheck.go | 4 +- .../healthcheck_integration_test.go | 2 +- metricbeat/module/docker/helper.go | 4 +- metricbeat/module/docker/helper_test.go | 4 +- metricbeat/module/docker/image/data.go | 4 +- metricbeat/module/docker/image/image.go | 4 +- .../docker/image/image_integration_test.go | 2 +- metricbeat/module/docker/info/data.go | 2 +- metricbeat/module/docker/info/info.go | 6 +- .../docker/info/info_integration_test.go | 2 +- metricbeat/module/docker/memory/data.go | 4 +- metricbeat/module/docker/memory/helper.go | 4 +- metricbeat/module/docker/memory/memory.go | 4 +- .../docker/memory/memory_integration_test.go | 2 +- .../module/docker/memory/memory_test.go | 6 +- metricbeat/module/docker/network/data.go | 4 +- metricbeat/module/docker/network/helper.go | 2 +- metricbeat/module/docker/network/network.go | 4 +- .../network/network_integration_test.go | 2 +- .../module/dropwizard/collector/collector.go | 6 +- .../collector/collector_integration_test.go | 6 +- .../dropwizard/collector/collector_test.go | 4 +- .../module/dropwizard/collector/data.go | 2 +- .../module/dropwizard/collector/data_test.go | 2 +- metricbeat/module/dropwizard/fields.go | 2 +- metricbeat/module/elasticsearch/ccr/ccr.go | 8 +- metricbeat/module/elasticsearch/ccr/data.go | 10 +- .../module/elasticsearch/ccr/data_test.go | 4 +- .../module/elasticsearch/ccr/data_xpack.go | 8 +- .../cluster_stats/cluster_stats.go | 4 +- .../elasticsearch/cluster_stats/data.go | 10 +- .../elasticsearch/cluster_stats/data_test.go | 2 +- .../elasticsearch/cluster_stats/data_xpack.go | 8 +- .../module/elasticsearch/elasticsearch.go | 8 +- .../elasticsearch_integration_test.go | 30 +- .../module/elasticsearch/enrich/data.go | 10 +- .../module/elasticsearch/enrich/data_test.go | 4 +- .../module/elasticsearch/enrich/data_xpack.go | 8 +- .../module/elasticsearch/enrich/enrich.go | 8 +- metricbeat/module/elasticsearch/fields.go | 2 +- metricbeat/module/elasticsearch/index/data.go | 10 +- .../module/elasticsearch/index/data_test.go | 4 +- .../module/elasticsearch/index/data_xpack.go | 12 +- .../module/elasticsearch/index/index.go | 4 +- .../elasticsearch/index_recovery/data.go | 12 +- .../elasticsearch/index_recovery/data_test.go | 2 +- .../index_recovery/data_xpack.go | 8 +- .../index_recovery/index_recovery.go | 4 +- .../elasticsearch/index_summary/data.go | 10 +- .../elasticsearch/index_summary/data_test.go | 4 +- .../elasticsearch/index_summary/data_xpack.go | 12 +- .../index_summary/index_summary.go | 6 +- metricbeat/module/elasticsearch/metricset.go | 6 +- .../module/elasticsearch/ml_job/data.go | 10 +- .../module/elasticsearch/ml_job/data_test.go | 2 +- .../module/elasticsearch/ml_job/data_xpack.go | 8 +- .../module/elasticsearch/ml_job/ml_job.go | 4 +- metricbeat/module/elasticsearch/node/data.go | 10 +- .../module/elasticsearch/node/data_test.go | 4 +- metricbeat/module/elasticsearch/node/node.go | 6 +- .../module/elasticsearch/node/node_test.go | 4 +- .../module/elasticsearch/node_stats/data.go | 12 +- .../elasticsearch/node_stats/data_test.go | 2 +- .../elasticsearch/node_stats/data_xpack.go | 12 +- .../elasticsearch/node_stats/node_stats.go | 4 +- .../elasticsearch/pending_tasks/data.go | 12 +- .../elasticsearch/pending_tasks/data_test.go | 8 +- .../pending_tasks/pending_tasks.go | 4 +- metricbeat/module/elasticsearch/shard/data.go | 10 +- .../module/elasticsearch/shard/data_test.go | 2 +- .../module/elasticsearch/shard/data_xpack.go | 8 +- .../module/elasticsearch/shard/shard.go | 4 +- metricbeat/module/elasticsearch/testing.go | 4 +- metricbeat/module/envoyproxy/fields.go | 2 +- metricbeat/module/envoyproxy/server/data.go | 6 +- metricbeat/module/envoyproxy/server/server.go | 6 +- .../server/server_integration_test.go | 4 +- .../module/envoyproxy/server/server_test.go | 4 +- metricbeat/module/etcd/fields.go | 2 +- metricbeat/module/etcd/leader/data.go | 2 +- metricbeat/module/etcd/leader/leader.go | 10 +- .../etcd/leader/leader_integration_test.go | 6 +- metricbeat/module/etcd/leader/leader_test.go | 2 +- metricbeat/module/etcd/metrics/metrics.go | 4 +- .../etcd/metrics/metrics_integration_test.go | 6 +- .../module/etcd/metrics/metrics_test.go | 6 +- metricbeat/module/etcd/self/data.go | 2 +- metricbeat/module/etcd/self/self.go | 8 +- .../module/etcd/self/self_integration_test.go | 4 +- metricbeat/module/etcd/self/self_test.go | 2 +- metricbeat/module/etcd/store/data.go | 6 +- metricbeat/module/etcd/store/store.go | 8 +- .../etcd/store/store_integration_test.go | 6 +- metricbeat/module/etcd/store/store_test.go | 4 +- metricbeat/module/golang/expvar/expvar.go | 8 +- .../golang/expvar/expvar_integration_test.go | 4 +- metricbeat/module/golang/fields.go | 2 +- metricbeat/module/golang/heap/data.go | 4 +- metricbeat/module/golang/heap/heap.go | 8 +- .../golang/heap/heap_integration_test.go | 4 +- metricbeat/module/golang/util.go | 2 +- metricbeat/module/graphite/fields.go | 2 +- metricbeat/module/graphite/server/data.go | 4 +- .../module/graphite/server/data_test.go | 2 +- metricbeat/module/graphite/server/server.go | 10 +- metricbeat/module/haproxy/fields.go | 2 +- metricbeat/module/haproxy/haproxy.go | 6 +- metricbeat/module/haproxy/haproxy_test.go | 2 +- metricbeat/module/haproxy/info/data.go | 10 +- metricbeat/module/haproxy/info/info.go | 8 +- .../haproxy/info/info_integration_test.go | 4 +- metricbeat/module/haproxy/stat/data.go | 10 +- metricbeat/module/haproxy/stat/stat.go | 6 +- .../haproxy/stat/stat_integration_test.go | 4 +- metricbeat/module/http/fields.go | 2 +- metricbeat/module/http/json/data.go | 4 +- metricbeat/module/http/json/json.go | 8 +- .../module/http/json/json_integration_test.go | 4 +- metricbeat/module/http/json/json_test.go | 4 +- metricbeat/module/http/server/config.go | 2 +- metricbeat/module/http/server/data.go | 6 +- metricbeat/module/http/server/data_test.go | 2 +- metricbeat/module/http/server/server.go | 6 +- .../iis/application_pool/application_pool.go | 6 +- .../application_pool/application_pool_test.go | 2 +- .../module/iis/application_pool/reader.go | 8 +- .../iis/application_pool/reader_test.go | 2 +- metricbeat/module/iis/fields.go | 2 +- .../webserver/webserver_integration_test.go | 6 +- .../module/iis/webserver/webserver_test.go | 2 +- .../iis/website/website_integration_test.go | 6 +- metricbeat/module/iis/website/website_test.go | 2 +- metricbeat/module/jolokia/fields.go | 2 +- metricbeat/module/jolokia/jmx/config.go | 4 +- metricbeat/module/jolokia/jmx/data.go | 4 +- metricbeat/module/jolokia/jmx/data_test.go | 2 +- metricbeat/module/jolokia/jmx/jmx.go | 10 +- .../jolokia/jmx/jmx_integration_test.go | 4 +- metricbeat/module/kafka/broker.go | 4 +- .../kafka/broker/broker_integration_test.go | 8 +- metricbeat/module/kafka/broker/broker_test.go | 6 +- metricbeat/module/kafka/config.go | 2 +- .../consumer/consumer_integration_test.go | 8 +- .../module/kafka/consumer/consumer_test.go | 6 +- .../kafka/consumergroup/consumergroup.go | 8 +- .../consumergroup_integration_test.go | 6 +- .../module/kafka/consumergroup/mock_test.go | 2 +- .../module/kafka/consumergroup/query.go | 6 +- .../module/kafka/consumergroup/query_test.go | 2 +- metricbeat/module/kafka/fields.go | 2 +- metricbeat/module/kafka/kafka.go | 2 +- metricbeat/module/kafka/metricset.go | 4 +- .../module/kafka/partition/partition.go | 10 +- .../partition/partition_integration_test.go | 8 +- .../producer/producer_integration_test.go | 8 +- .../module/kafka/producer/producer_test.go | 6 +- metricbeat/module/kibana/fields.go | 2 +- metricbeat/module/kibana/kibana.go | 8 +- .../module/kibana/kibana_integration_test.go | 8 +- metricbeat/module/kibana/kibana_test.go | 2 +- metricbeat/module/kibana/metricset.go | 2 +- metricbeat/module/kibana/stats/data.go | 12 +- metricbeat/module/kibana/stats/data_test.go | 2 +- metricbeat/module/kibana/stats/data_xpack.go | 10 +- .../module/kibana/stats/data_xpack_test.go | 2 +- metricbeat/module/kibana/stats/stats.go | 8 +- .../kibana/stats/stats_integration_test.go | 10 +- metricbeat/module/kibana/stats/stats_test.go | 4 +- metricbeat/module/kibana/status/data.go | 12 +- metricbeat/module/kibana/status/data_test.go | 2 +- metricbeat/module/kibana/status/status.go | 8 +- .../kibana/status/status_integration_test.go | 6 +- .../module/kibana/status/status_test.go | 4 +- .../module/kubernetes/apiserver/apiserver.go | 4 +- .../kubernetes/apiserver/apiserver_test.go | 6 +- .../module/kubernetes/apiserver/metricset.go | 4 +- .../module/kubernetes/container/container.go | 10 +- .../kubernetes/container/container_test.go | 4 +- .../module/kubernetes/container/data.go | 8 +- .../controllermanager/controllermanager.go | 4 +- .../controllermanager_test.go | 2 +- metricbeat/module/kubernetes/event/event.go | 8 +- .../module/kubernetes/event/event_test.go | 2 +- metricbeat/module/kubernetes/fields.go | 2 +- metricbeat/module/kubernetes/node/data.go | 4 +- metricbeat/module/kubernetes/node/node.go | 14 +- .../module/kubernetes/node/node_test.go | 2 +- metricbeat/module/kubernetes/pod/data.go | 8 +- metricbeat/module/kubernetes/pod/pod.go | 12 +- metricbeat/module/kubernetes/pod/pod_test.go | 4 +- metricbeat/module/kubernetes/proxy/proxy.go | 4 +- .../module/kubernetes/proxy/proxy_test.go | 2 +- .../module/kubernetes/scheduler/scheduler.go | 4 +- .../kubernetes/scheduler/scheduler_test.go | 2 +- .../state_container/state_container.go | 10 +- .../state_container/state_container_test.go | 6 +- .../kubernetes/state_cronjob/state_cronjob.go | 6 +- .../state_cronjob/state_cronjob_test.go | 2 +- .../state_deployment/state_deployment.go | 12 +- .../state_deployment/state_deployment_test.go | 6 +- .../kubernetes/state_node/state_node.go | 10 +- .../kubernetes/state_node/state_node_test.go | 6 +- .../state_persistentvolume.go | 4 +- .../state_persistentvolume_test.go | 2 +- .../state_persistentvolumeclaim.go | 4 +- .../state_persistentvolumeclaim_test.go | 2 +- .../module/kubernetes/state_pod/state_pod.go | 12 +- .../kubernetes/state_pod/state_pod_test.go | 6 +- .../state_replicaset/state_replicaset.go | 12 +- .../state_replicaset/state_replicaset_test.go | 6 +- .../state_resourcequota.go | 4 +- .../state_resourcequota_test.go | 2 +- .../kubernetes/state_service/state_service.go | 4 +- .../state_service/state_service_test.go | 2 +- .../state_statefulset/state_statefulset.go | 12 +- .../state_statefulset_test.go | 6 +- .../state_storageclass/state_storageclass.go | 4 +- .../state_storageclass_test.go | 2 +- metricbeat/module/kubernetes/system/data.go | 6 +- metricbeat/module/kubernetes/system/system.go | 8 +- .../module/kubernetes/system/system_test.go | 2 +- .../module/kubernetes/util/kubernetes.go | 10 +- .../module/kubernetes/util/kubernetes_test.go | 4 +- .../module/kubernetes/util/metrics_cache.go | 2 +- metricbeat/module/kubernetes/volume/data.go | 6 +- metricbeat/module/kubernetes/volume/volume.go | 8 +- .../module/kubernetes/volume/volume_test.go | 2 +- .../module/kvm/dommemstat/dommemstat.go | 6 +- .../module/kvm/dommemstat/dommemstat_test.go | 2 +- metricbeat/module/kvm/fields.go | 2 +- metricbeat/module/logstash/fields.go | 2 +- metricbeat/module/logstash/logstash.go | 8 +- .../logstash/logstash_integration_test.go | 10 +- metricbeat/module/logstash/node/data.go | 12 +- metricbeat/module/logstash/node/data_test.go | 2 +- metricbeat/module/logstash/node/data_xpack.go | 8 +- metricbeat/module/logstash/node/node.go | 6 +- metricbeat/module/logstash/node_stats/data.go | 12 +- .../module/logstash/node_stats/data_test.go | 2 +- .../module/logstash/node_stats/data_xpack.go | 8 +- .../module/logstash/node_stats/node_stats.go | 6 +- metricbeat/module/memcached/fields.go | 2 +- metricbeat/module/memcached/stats/data.go | 4 +- metricbeat/module/memcached/stats/stats.go | 4 +- .../memcached/stats/stats_integration_test.go | 4 +- .../module/mongodb/collstats/collstats.go | 6 +- .../collstats/collstats_integration_test.go | 4 +- metricbeat/module/mongodb/collstats/data.go | 2 +- .../module/mongodb/collstats/data_test.go | 2 +- metricbeat/module/mongodb/dbstats/data.go | 4 +- metricbeat/module/mongodb/dbstats/dbstats.go | 8 +- .../dbstats/dbstats_integration_test.go | 4 +- metricbeat/module/mongodb/fields.go | 2 +- metricbeat/module/mongodb/metrics/data.go | 4 +- metricbeat/module/mongodb/metrics/metrics.go | 6 +- .../metrics/metrics_intergration_test.go | 4 +- metricbeat/module/mongodb/metricset.go | 6 +- metricbeat/module/mongodb/mongodb.go | 6 +- metricbeat/module/mongodb/mongodb_test.go | 2 +- metricbeat/module/mongodb/replstatus/data.go | 2 +- .../module/mongodb/replstatus/replstatus.go | 4 +- .../replstatus/replstatus_integration_test.go | 8 +- metricbeat/module/mongodb/status/data.go | 4 +- metricbeat/module/mongodb/status/status.go | 6 +- .../mongodb/status/status_integration_test.go | 4 +- metricbeat/module/munin/fields.go | 2 +- metricbeat/module/munin/munin.go | 4 +- metricbeat/module/munin/munin_test.go | 2 +- metricbeat/module/munin/node/node.go | 6 +- .../munin/node/node_integration_test.go | 4 +- metricbeat/module/mysql/fields.go | 2 +- metricbeat/module/mysql/galera_status/data.go | 6 +- .../module/mysql/galera_status/status.go | 6 +- metricbeat/module/mysql/mysql.go | 2 +- .../module/mysql/mysql_integration_test.go | 4 +- metricbeat/module/mysql/mysql_test.go | 2 +- metricbeat/module/mysql/status/data.go | 6 +- metricbeat/module/mysql/status/status.go | 4 +- .../mysql/status/status_integration_test.go | 8 +- metricbeat/module/mysql/status/status_test.go | 4 +- .../module/nats/connections/connections.go | 8 +- .../connections_integration_test.go | 4 +- .../nats/connections/connections_test.go | 2 +- metricbeat/module/nats/connections/data.go | 6 +- metricbeat/module/nats/fields.go | 2 +- metricbeat/module/nats/routes/data.go | 6 +- metricbeat/module/nats/routes/routes.go | 8 +- .../nats/routes/routes_integration_test.go | 4 +- metricbeat/module/nats/routes/routes_test.go | 2 +- metricbeat/module/nats/stats/data.go | 8 +- metricbeat/module/nats/stats/stats.go | 8 +- .../nats/stats/stats_integration_test.go | 4 +- metricbeat/module/nats/stats/stats_test.go | 2 +- metricbeat/module/nats/subscriptions/data.go | 6 +- .../nats/subscriptions/subscriptions.go | 8 +- .../subscriptions_integration_test.go | 4 +- .../nats/subscriptions/subscriptions_test.go | 2 +- metricbeat/module/nginx/fields.go | 2 +- metricbeat/module/nginx/stubstatus/data.go | 2 +- .../module/nginx/stubstatus/stubstatus.go | 8 +- .../stubstatus/stubstatus_integration_test.go | 4 +- metricbeat/module/php_fpm/fields.go | 2 +- metricbeat/module/php_fpm/pool/data.go | 4 +- metricbeat/module/php_fpm/pool/pool.go | 6 +- .../php_fpm/pool/pool_integration_test.go | 4 +- metricbeat/module/php_fpm/pool/pool_test.go | 4 +- metricbeat/module/php_fpm/process/data.go | 4 +- metricbeat/module/php_fpm/process/process.go | 8 +- .../process/process_integration_test.go | 4 +- .../module/php_fpm/process/process_test.go | 4 +- metricbeat/module/php_fpm/url.go | 2 +- metricbeat/module/plugin.go | 4 +- .../module/postgresql/activity/activity.go | 4 +- .../activity/activity_integration_test.go | 8 +- metricbeat/module/postgresql/activity/data.go | 4 +- .../module/postgresql/bgwriter/bgwriter.go | 4 +- .../bgwriter/bgwriter_integration_test.go | 8 +- metricbeat/module/postgresql/bgwriter/data.go | 4 +- metricbeat/module/postgresql/database/data.go | 4 +- .../module/postgresql/database/database.go | 4 +- .../database/database_integration_test.go | 8 +- metricbeat/module/postgresql/fields.go | 2 +- metricbeat/module/postgresql/metricset.go | 4 +- metricbeat/module/postgresql/postgresql.go | 4 +- .../module/postgresql/postgresql_test.go | 2 +- .../module/postgresql/statement/data.go | 4 +- .../module/postgresql/statement/statement.go | 4 +- .../statement/statement_integration_test.go | 8 +- .../module/prometheus/collector/collector.go | 8 +- .../prometheus/collector/collector_test.go | 8 +- .../module/prometheus/collector/data.go | 4 +- metricbeat/module/prometheus/fields.go | 2 +- .../module/rabbitmq/connection/connection.go | 4 +- .../rabbitmq/connection/connection_test.go | 8 +- metricbeat/module/rabbitmq/connection/data.go | 8 +- metricbeat/module/rabbitmq/exchange/data.go | 8 +- .../module/rabbitmq/exchange/exchange.go | 4 +- .../module/rabbitmq/exchange/exchange_test.go | 6 +- metricbeat/module/rabbitmq/fields.go | 2 +- metricbeat/module/rabbitmq/metricset.go | 4 +- metricbeat/module/rabbitmq/metricset_test.go | 8 +- metricbeat/module/rabbitmq/node/data.go | 6 +- metricbeat/module/rabbitmq/node/node.go | 4 +- .../rabbitmq/node/node_integration_test.go | 6 +- metricbeat/module/rabbitmq/node/node_test.go | 6 +- metricbeat/module/rabbitmq/queue/data.go | 8 +- metricbeat/module/rabbitmq/queue/queue.go | 4 +- .../module/rabbitmq/queue/queue_test.go | 6 +- metricbeat/module/rabbitmq/url.go | 2 +- metricbeat/module/redis/fields.go | 2 +- metricbeat/module/redis/info/data.go | 8 +- metricbeat/module/redis/info/info.go | 6 +- .../redis/info/info_integration_test.go | 6 +- metricbeat/module/redis/info/info_test.go | 4 +- metricbeat/module/redis/key/data.go | 4 +- metricbeat/module/redis/key/key.go | 6 +- .../module/redis/key/key_integration_test.go | 6 +- metricbeat/module/redis/keyspace/data.go | 10 +- metricbeat/module/redis/keyspace/keyspace.go | 6 +- .../keyspace/keyspace_integration_test.go | 4 +- metricbeat/module/redis/metricset.go | 2 +- .../redis/metricset_integration_test.go | 10 +- metricbeat/module/redis/metricset_test.go | 2 +- metricbeat/module/redis/redis.go | 2 +- .../module/redis/redis_integration_test.go | 4 +- metricbeat/module/system/core/config.go | 2 +- metricbeat/module/system/core/core.go | 8 +- metricbeat/module/system/core/core_test.go | 2 +- metricbeat/module/system/cpu/config.go | 2 +- metricbeat/module/system/cpu/cpu.go | 8 +- metricbeat/module/system/cpu/cpu_test.go | 2 +- metricbeat/module/system/diskio/diskio.go | 6 +- .../module/system/diskio/diskio_test.go | 2 +- .../module/system/diskio/diskstat_linux.go | 2 +- .../system/diskio/diskstat_linux_test.go | 4 +- .../system/diskio/diskstat_windows_helper.go | 2 +- .../system/diskio/diskstat_windows_test.go | 4 +- metricbeat/module/system/entropy/entropy.go | 8 +- .../module/system/entropy/entropy_test.go | 4 +- metricbeat/module/system/fields.go | 2 +- .../module/system/filesystem/filesystem.go | 6 +- .../system/filesystem/filesystem_test.go | 2 +- metricbeat/module/system/filesystem/helper.go | 4 +- metricbeat/module/system/fsstat/fsstat.go | 8 +- .../module/system/fsstat/fsstat_test.go | 2 +- metricbeat/module/system/load/load.go | 8 +- metricbeat/module/system/load/load_test.go | 2 +- metricbeat/module/system/memory/memory.go | 8 +- .../module/system/memory/memory_test.go | 2 +- metricbeat/module/system/network/network.go | 8 +- .../module/system/network/network_test.go | 2 +- .../module/system/network_summary/data.go | 2 +- .../system/network_summary/network_summary.go | 4 +- .../network_summary/network_summary_test.go | 4 +- metricbeat/module/system/process/cgroup.go | 2 +- metricbeat/module/system/process/config.go | 4 +- metricbeat/module/system/process/process.go | 12 +- .../module/system/process/process_test.go | 2 +- .../system/process_summary/process_summary.go | 10 +- .../process_summary/process_summary_test.go | 4 +- .../module/system/raid/blockinfo/blockinfo.go | 2 +- .../module/system/raid/blockinfo/parser.go | 4 +- metricbeat/module/system/raid/raid.go | 10 +- metricbeat/module/system/raid/raid_test.go | 2 +- metricbeat/module/system/service/data.go | 6 +- metricbeat/module/system/service/service.go | 6 +- .../module/system/service/service_test.go | 4 +- metricbeat/module/system/socket/socket.go | 12 +- .../module/system/socket/socket_test.go | 6 +- .../system/socket_summary/socket_summary.go | 4 +- .../system/socket_summary/sockstat_linux.go | 4 +- .../system/socket_summary/sockstat_other.go | 2 +- metricbeat/module/system/system.go | 2 +- metricbeat/module/system/system_windows.go | 4 +- metricbeat/module/system/uptime/uptime.go | 6 +- .../module/system/uptime/uptime_test.go | 2 +- metricbeat/module/traefik/fields.go | 2 +- metricbeat/module/traefik/health/data.go | 6 +- metricbeat/module/traefik/health/data_test.go | 2 +- metricbeat/module/traefik/health/health.go | 8 +- .../traefik/health/health_integration_test.go | 6 +- .../module/traefik/health/health_test.go | 6 +- metricbeat/module/uwsgi/fields.go | 2 +- metricbeat/module/uwsgi/status/data.go | 4 +- metricbeat/module/uwsgi/status/status.go | 6 +- .../uwsgi/status/status_integration_test.go | 4 +- .../module/uwsgi/status/status_linux_test.go | 2 +- metricbeat/module/uwsgi/status/status_test.go | 6 +- metricbeat/module/uwsgi/uwsgi.go | 4 +- metricbeat/module/uwsgi/uwsgi_test.go | 2 +- .../module/vsphere/datastore/datastore.go | 6 +- .../vsphere/datastore/datastore_test.go | 2 +- metricbeat/module/vsphere/fields.go | 2 +- metricbeat/module/vsphere/host/data.go | 2 +- metricbeat/module/vsphere/host/host.go | 6 +- metricbeat/module/vsphere/host/host_test.go | 4 +- .../vsphere/virtualmachine/virtualmachine.go | 6 +- .../virtualmachine/virtualmachine_test.go | 4 +- metricbeat/module/windows/fields.go | 2 +- metricbeat/module/windows/perfmon/perfmon.go | 8 +- .../module/windows/perfmon/perfmon_test.go | 8 +- metricbeat/module/windows/perfmon/reader.go | 8 +- metricbeat/module/windows/service/doc.go | 2 +- metricbeat/module/windows/service/service.go | 2 +- .../service_integration_windows_test.go | 4 +- .../module/windows/service/service_windows.go | 6 +- metricbeat/module/windows/windows.go | 6 +- .../module/zookeeper/connection/connection.go | 8 +- .../connection/connection_integration_test.go | 4 +- .../zookeeper/connection/connection_test.go | 2 +- .../module/zookeeper/connection/data.go | 4 +- metricbeat/module/zookeeper/fields.go | 2 +- metricbeat/module/zookeeper/mntr/data.go | 10 +- metricbeat/module/zookeeper/mntr/mntr.go | 6 +- .../zookeeper/mntr/mntr_integration_test.go | 6 +- metricbeat/module/zookeeper/server/data.go | 4 +- metricbeat/module/zookeeper/server/server.go | 8 +- .../server/server_integration_test.go | 6 +- .../module/zookeeper/server/server_test.go | 4 +- .../add_kubernetes_metadata/indexers.go | 4 +- metricbeat/scripts/assets/assets.go | 6 +- metricbeat/scripts/mage/config.go | 2 +- metricbeat/scripts/mage/docs_collector.go | 8 +- metricbeat/scripts/mage/fields.go | 2 +- metricbeat/scripts/mage/package.go | 2 +- .../module/metricset/metricset.go.tmpl | 6 +- metricbeat/scripts/msetlists/cmd/main.go | 8 +- metricbeat/scripts/msetlists/msetlists.go | 2 +- packetbeat/beater/packetbeat.go | 34 +- packetbeat/cmd/devices.go | 2 +- packetbeat/cmd/root.go | 8 +- packetbeat/config/config.go | 6 +- packetbeat/decoder/decoder.go | 12 +- packetbeat/decoder/decoder_test.go | 6 +- packetbeat/flows/flows.go | 6 +- packetbeat/flows/flows_test.go | 8 +- packetbeat/flows/util.go | 4 +- packetbeat/flows/worker.go | 10 +- packetbeat/flows/worker_test.go | 4 +- packetbeat/include/fields.go | 2 +- packetbeat/include/list.go | 28 +- packetbeat/magefile.go | 12 +- packetbeat/main.go | 2 +- packetbeat/main_test.go | 4 +- packetbeat/pb/event.go | 6 +- packetbeat/pb/event_test.go | 2 +- .../add_kubernetes_metadata/indexers.go | 4 +- packetbeat/procs/procs.go | 6 +- packetbeat/procs/procs_linux.go | 4 +- packetbeat/procs/procs_linux_test.go | 2 +- packetbeat/procs/procs_other.go | 2 +- packetbeat/procs/procs_test.go | 6 +- packetbeat/procs/procs_windows.go | 2 +- packetbeat/protocols/plugin.go | 4 +- packetbeat/protos/amqp/amqp.go | 12 +- packetbeat/protos/amqp/amqp_fields.go | 4 +- packetbeat/protos/amqp/amqp_methods.go | 4 +- packetbeat/protos/amqp/amqp_parser.go | 6 +- packetbeat/protos/amqp/amqp_structs.go | 2 +- packetbeat/protos/amqp/amqp_test.go | 10 +- packetbeat/protos/amqp/config.go | 4 +- packetbeat/protos/amqp/fields.go | 2 +- packetbeat/protos/applayer/applayer.go | 8 +- packetbeat/protos/cassandra/cassandra.go | 10 +- packetbeat/protos/cassandra/config.go | 6 +- packetbeat/protos/cassandra/fields.go | 2 +- .../protos/cassandra/internal/gocql/frame.go | 4 +- .../cassandra/internal/gocql/marshal.go | 2 +- .../internal/gocql/stream_decoder.go | 2 +- packetbeat/protos/cassandra/parser.go | 8 +- packetbeat/protos/cassandra/pub.go | 8 +- packetbeat/protos/cassandra/trans.go | 8 +- packetbeat/protos/dhcpv4/config.go | 2 +- packetbeat/protos/dhcpv4/dhcpv4.go | 12 +- packetbeat/protos/dhcpv4/dhcpv4_test.go | 10 +- packetbeat/protos/dhcpv4/fields.go | 2 +- packetbeat/protos/dhcpv4/options.go | 2 +- packetbeat/protos/dns/config.go | 4 +- packetbeat/protos/dns/dns.go | 10 +- packetbeat/protos/dns/dns_tcp.go | 10 +- packetbeat/protos/dns/dns_tcp_test.go | 6 +- packetbeat/protos/dns/dns_test.go | 10 +- packetbeat/protos/dns/dns_udp.go | 6 +- packetbeat/protos/dns/dns_udp_test.go | 4 +- packetbeat/protos/dns/fields.go | 2 +- packetbeat/protos/dns/names_test.go | 2 +- packetbeat/protos/http/config.go | 6 +- packetbeat/protos/http/event.go | 2 +- packetbeat/protos/http/fields.go | 2 +- packetbeat/protos/http/http.go | 14 +- packetbeat/protos/http/http_parser.go | 8 +- packetbeat/protos/http/http_test.go | 10 +- packetbeat/protos/icmp/config.go | 2 +- packetbeat/protos/icmp/fields.go | 2 +- packetbeat/protos/icmp/icmp.go | 12 +- packetbeat/protos/icmp/icmp_test.go | 8 +- packetbeat/protos/icmp/message.go | 2 +- packetbeat/protos/memcache/binary.go | 4 +- packetbeat/protos/memcache/commands.go | 4 +- packetbeat/protos/memcache/config.go | 4 +- packetbeat/protos/memcache/fields.go | 2 +- packetbeat/protos/memcache/memcache.go | 12 +- packetbeat/protos/memcache/memcache_test.go | 4 +- packetbeat/protos/memcache/parse.go | 2 +- packetbeat/protos/memcache/parse_test.go | 4 +- packetbeat/protos/memcache/plugin_tcp.go | 12 +- packetbeat/protos/memcache/plugin_udp.go | 12 +- packetbeat/protos/memcache/text.go | 4 +- packetbeat/protos/mongodb/config.go | 4 +- packetbeat/protos/mongodb/fields.go | 2 +- packetbeat/protos/mongodb/mongodb.go | 16 +- packetbeat/protos/mongodb/mongodb_parser.go | 4 +- packetbeat/protos/mongodb/mongodb_structs.go | 2 +- packetbeat/protos/mongodb/mongodb_test.go | 8 +- packetbeat/protos/mysql/config.go | 4 +- packetbeat/protos/mysql/fields.go | 2 +- packetbeat/protos/mysql/mysql.go | 16 +- packetbeat/protos/mysql/mysql_test.go | 12 +- packetbeat/protos/nfs/config.go | 2 +- packetbeat/protos/nfs/fields.go | 2 +- packetbeat/protos/nfs/nfs.go | 6 +- packetbeat/protos/nfs/request_handler.go | 8 +- packetbeat/protos/nfs/rpc.go | 8 +- packetbeat/protos/pgsql/config.go | 4 +- packetbeat/protos/pgsql/fields.go | 2 +- packetbeat/protos/pgsql/parse.go | 2 +- packetbeat/protos/pgsql/pgsql.go | 16 +- packetbeat/protos/pgsql/pgsql_test.go | 10 +- packetbeat/protos/protos.go | 8 +- packetbeat/protos/protos_test.go | 2 +- packetbeat/protos/redis/config.go | 4 +- packetbeat/protos/redis/fields.go | 2 +- packetbeat/protos/redis/redis.go | 20 +- packetbeat/protos/redis/redis_parse.go | 6 +- packetbeat/protos/registry.go | 4 +- packetbeat/protos/tcp/tcp.go | 10 +- packetbeat/protos/tcp/tcp_test.go | 4 +- packetbeat/protos/thrift/config.go | 4 +- packetbeat/protos/thrift/fields.go | 2 +- packetbeat/protos/thrift/thrift.go | 16 +- packetbeat/protos/thrift/thrift_idl.go | 2 +- packetbeat/protos/thrift/thrift_idl_test.go | 2 +- packetbeat/protos/thrift/thrift_test.go | 6 +- packetbeat/protos/tls/alerts.go | 4 +- packetbeat/protos/tls/alerts_test.go | 4 +- packetbeat/protos/tls/buffer.go | 2 +- packetbeat/protos/tls/config.go | 4 +- packetbeat/protos/tls/extensions.go | 4 +- packetbeat/protos/tls/fields.go | 2 +- packetbeat/protos/tls/ja3_test.go | 2 +- packetbeat/protos/tls/parse.go | 6 +- packetbeat/protos/tls/parse_test.go | 6 +- packetbeat/protos/tls/tls.go | 18 +- packetbeat/protos/tls/tls_test.go | 10 +- packetbeat/protos/udp/udp.go | 8 +- packetbeat/protos/udp/udp_test.go | 12 +- packetbeat/publish/publish.go | 10 +- packetbeat/publish/publish_test.go | 6 +- packetbeat/scripts/mage/config.go | 2 +- packetbeat/scripts/tcp-protocol/README.md | 6 +- .../tcp-protocol/{protocol}/config.go.tmpl | 4 +- .../tcp-protocol/{protocol}/parser.go.tmpl | 4 +- .../tcp-protocol/{protocol}/pub.go.tmpl | 6 +- .../tcp-protocol/{protocol}/trans.go.tmpl | 8 +- .../{protocol}/{protocol}.go.tmpl | 8 +- packetbeat/sniffer/afpacket_linux.go | 2 +- packetbeat/sniffer/device.go | 2 +- packetbeat/sniffer/file.go | 2 +- packetbeat/sniffer/sniffer.go | 6 +- script/clean_vendor.sh | 48 - script/update_golang_x.py | 39 - tools/tools.go | 37 + vendor/4d63.com/embedfiles/LICENSE | 19 + vendor/4d63.com/embedfiles/README.md | 69 + vendor/4d63.com/embedfiles/main.go | 121 + vendor/4d63.com/tz/.gitignore | 1 + vendor/4d63.com/tz/tools.go | 5 + vendor/cloud.google.com/go/CHANGES.md | 1419 ++ vendor/cloud.google.com/go/CODE_OF_CONDUCT.md | 44 + vendor/cloud.google.com/go/CONTRIBUTING.md | 306 + vendor/cloud.google.com/go/README.md | 179 + vendor/cloud.google.com/go/RELEASING.md | 153 + .../go/compute/metadata/.repo-metadata.json | 12 + .../go/compute/metadata/metadata.go | 24 +- .../go/datastore}/LICENSE | 0 .../cloud.google.com/go/datastore/README.md | 41 + .../cloud.google.com/go/datastore/client.go | 118 + .../go/datastore/datastore.go | 670 + .../go/datastore/datastore.replay | Bin 0 -> 3783246 bytes vendor/cloud.google.com/go/datastore/doc.go | 497 + .../cloud.google.com/go/datastore/errors.go | 47 + vendor/cloud.google.com/go/datastore/go.mod | 15 + vendor/cloud.google.com/go/datastore/go.sum | 116 + .../go/datastore/go_mod_tidy_hack.go | 22 + .../internal/gaepb/datastore_v3.pb.go | 432 + vendor/cloud.google.com/go/datastore/key.go | 293 + .../go/datastore/keycompat.go | 66 + vendor/cloud.google.com/go/datastore/load.go | 545 + .../cloud.google.com/go/datastore/mutation.go | 129 + vendor/cloud.google.com/go/datastore/prop.go | 339 + vendor/cloud.google.com/go/datastore/query.go | 786 + vendor/cloud.google.com/go/datastore/save.go | 484 + vendor/cloud.google.com/go/datastore/time.go | 36 + .../go/datastore/transaction.go | 402 + vendor/cloud.google.com/go/doc.go | 100 + .../go/functions/metadata/.repo-metadata.json | 12 + .../go/functions/metadata/metadata.go | 32 + vendor/cloud.google.com/go/go.mod | 32 + vendor/cloud.google.com/go/go.sum | 257 + .../go/iam/.repo-metadata.json | 12 + .../go/internal/fields/fields.go | 480 + .../go/internal/fields/fold.go | 156 + .../go/internal/version/update_version.sh | 13 + .../go/internal/version/version.go | 2 +- vendor/cloud.google.com/go/issue_template.md | 17 + .../go/monitoring/apiv3/.repo-metadata.json | 12 + .../go/monitoring/apiv3/doc.go | 2 +- vendor/cloud.google.com/go/pubsub/CHANGES.md | 6 + .../go/pubsub}/LICENSE | 0 vendor/cloud.google.com/go/pubsub/README.md | 46 + .../cloud.google.com/go/pubsub/apiv1/doc.go | 2 +- .../go/pubsub/apiv1/publisher_client.go | 17 +- .../go/pubsub/apiv1/subscriber_client.go | 31 +- vendor/cloud.google.com/go/pubsub/doc.go | 11 +- vendor/cloud.google.com/go/pubsub/go.mod | 17 + vendor/cloud.google.com/go/pubsub/go.sum | 121 + .../go/pubsub/go_mod_tidy_hack.go | 22 + .../internal/distribution/distribution.go | 22 +- vendor/cloud.google.com/go/pubsub/iterator.go | 46 +- vendor/cloud.google.com/go/pubsub/pubsub.go | 1 - vendor/cloud.google.com/go/pubsub/service.go | 11 +- vendor/cloud.google.com/go/pubsub/snapshot.go | 4 +- .../go/pubsub/subscription.go | 148 +- vendor/cloud.google.com/go/pubsub/topic.go | 105 +- vendor/cloud.google.com/go/pubsub/trace.go | 100 +- .../go/storage/.repo-metadata.json | 12 + vendor/cloud.google.com/go/storage/CHANGES.md | 6 + .../go/storage}/LICENSE | 0 vendor/cloud.google.com/go/storage/bucket.go | 13 +- vendor/cloud.google.com/go/storage/go.mod | 14 + vendor/cloud.google.com/go/storage/go.sum | 156 + .../go/storage/go_mod_tidy_hack.go | 22 + vendor/cloud.google.com/go/storage/hmac.go | 168 +- vendor/cloud.google.com/go/storage/reader.go | 34 +- vendor/cloud.google.com/go/storage/storage.go | 6 +- vendor/cloud.google.com/go/storage/writer.go | 27 +- vendor/cloud.google.com/go/tools.go | 33 + .../go-diodes/.travis.yml | 17 + .../go-loggregator/.gitignore | 1 + .../go-loggregator/.travis.yml | 21 + .../go-loggregator/go.mod | 33 - .../go-loggregator/go.sum | 158 - .../rpc/loggregator_v2/generate.sh | 0 .../code.cloudfoundry.org/rfc5424/.travis.yml | 5 + .../exporter/ocagent/CONTRIBUTING.md | 24 - .../exporter/ocagent/LICENSE | 201 - .../exporter/ocagent/README.md | 61 - .../exporter/ocagent/common.go | 38 - .../exporter/ocagent/connection.go | 113 - .../exporter/ocagent/go.mod | 14 - .../exporter/ocagent/go.sum | 120 - .../exporter/ocagent/nodeinfo.go | 46 - .../exporter/ocagent/ocagent.go | 540 - .../exporter/ocagent/options.go | 161 - .../exporter/ocagent/transform_spans.go | 248 - .../ocagent/transform_stats_to_metrics.go | 274 - .../exporter/ocagent/version.go | 17 - .../Azure/azure-amqp-common-go/v3/.gitignore | 19 + .../Azure/azure-amqp-common-go/v3/.travis.yml | 20 + .../Azure/azure-event-hubs-go/v3/.gitignore | 29 + .../Azure/azure-event-hubs-go/v3/.travis.yml | 36 + .../Azure/azure-event-hubs-go/v3/changelog.md | 2 + .../Azure/azure-event-hubs-go/v3/eph/eph.go | 17 + .../Azure/azure-event-hubs-go/v3/version.go | 2 +- .../2017-04-01/eventhub/consumergroups.go | 16 +- .../mgmt/2017-04-01/eventhub/eventhubs.go | 39 +- .../mgmt/2017-04-01/eventhub/namespaces.go | 4 +- .../mgmt/2019-06-01/insights/logprofiles.go | 2 +- .../mgmt/2019-03-01/resources/deployments.go | 72 + .../mgmt/2019-03-01/resources/models.go | 37 + .../Azure/azure-sdk-for-go/version/version.go | 2 +- .../github.com/Azure/go-amqp/.gitattributes | 3 + vendor/github.com/Azure/go-amqp/.gitignore | 11 + .../Azure/go-amqp/CODE_OF_CONDUCT.md | 18 +- vendor/github.com/Azure/go-amqp/LICENSE | 42 +- vendor/github.com/Azure/go-amqp/README.md | 288 +- vendor/github.com/Azure/go-amqp/SECURITY.md | 82 +- .../Azure/go-autorest/{ => autorest}/LICENSE | 0 .../Azure/go-autorest/autorest/adal/LICENSE | 191 + .../go-autorest/autorest/adal/devicetoken.go | 35 +- .../Azure/go-autorest/autorest/adal/go.mod | 9 +- .../Azure/go-autorest/autorest/adal/go.sum | 145 +- .../autorest/adal/go_mod_tidy_hack.go | 24 + .../Azure/go-autorest/autorest/adal/sender.go | 37 +- .../Azure/go-autorest/autorest/adal/token.go | 143 +- .../go-autorest/autorest/authorization.go | 10 +- .../go-autorest/autorest/authorization_sas.go | 67 + .../autorest/authorization_storage.go | 301 + .../go-autorest/autorest/azure/auth/LICENSE | 191 + .../go-autorest/autorest/azure/auth/auth.go | 2 +- .../go-autorest/autorest/azure/auth/go.mod | 8 +- .../go-autorest/autorest/azure/auth/go.sum | 162 +- .../autorest/azure/auth/go_mod_tidy_hack.go | 24 + .../Azure/go-autorest/autorest/azure/azure.go | 19 +- .../go-autorest/autorest/azure/cli/LICENSE | 191 + .../go-autorest/autorest/azure/cli/go.mod | 5 +- .../go-autorest/autorest/azure/cli/go.sum | 147 +- .../autorest/azure/cli/go_mod_tidy_hack.go | 24 + .../go-autorest/autorest/azure/cli/profile.go | 6 +- .../go-autorest/autorest/azure/cli/token.go | 21 +- .../Azure/go-autorest/autorest/azure/rp.go | 12 +- .../Azure/go-autorest/autorest/client.go | 26 +- .../Azure/go-autorest/autorest/date/LICENSE | 191 + .../Azure/go-autorest/autorest/date/go.mod | 2 + .../Azure/go-autorest/autorest/date/go.sum | 16 + .../autorest/date/go_mod_tidy_hack.go | 24 + .../Azure/go-autorest/autorest/go.mod | 9 +- .../Azure/go-autorest/autorest/go.sum | 147 +- .../Azure/go-autorest/autorest/preparer.go | 14 +- .../Azure/go-autorest/autorest/sender.go | 33 +- .../Azure/go-autorest/autorest/to/LICENSE | 191 + .../Azure/go-autorest/autorest/to/go.mod | 2 + .../Azure/go-autorest/autorest/to/go.sum | 17 + .../autorest/to/go_mod_tidy_hack.go | 24 + .../Azure/go-autorest/autorest/utility.go | 10 +- .../go-autorest/autorest/validation/LICENSE | 191 + .../go-autorest/autorest/validation/go.mod | 5 +- .../go-autorest/autorest/validation/go.sum | 17 + .../autorest/validation/go_mod_tidy_hack.go | 24 + .../Azure/go-autorest/autorest/version.go | 2 +- .../Azure/go-autorest/logger/LICENSE | 191 + .../Azure/go-autorest/tracing/LICENSE | 191 + .../Azure/go-autorest/tracing/go.mod | 10 - .../Azure/go-autorest/tracing/go.sum | 68 - .../Azure/go-autorest/tracing/tracing.go | 184 +- vendor/github.com/BurntSushi/toml/.gitignore | 5 + vendor/github.com/BurntSushi/toml/.travis.yml | 15 + vendor/github.com/BurntSushi/toml/COMPATIBLE | 3 + vendor/github.com/BurntSushi/toml/COPYING | 21 + vendor/github.com/BurntSushi/toml/Makefile | 19 + vendor/github.com/BurntSushi/toml/README.md | 218 + vendor/github.com/BurntSushi/toml/decode.go | 509 + .../github.com/BurntSushi/toml/decode_meta.go | 121 + vendor/github.com/BurntSushi/toml/doc.go | 27 + vendor/github.com/BurntSushi/toml/encode.go | 568 + .../BurntSushi/toml/encoding_types.go | 19 + .../BurntSushi/toml/encoding_types_1.1.go | 18 + vendor/github.com/BurntSushi/toml/lex.go | 953 + vendor/github.com/BurntSushi/toml/parse.go | 592 + vendor/github.com/BurntSushi/toml/session.vim | 1 + .../github.com/BurntSushi/toml/type_check.go | 91 + .../github.com/BurntSushi/toml/type_fields.go | 242 + vendor/github.com/DataDog/zstd/LICENSE | 27 - vendor/github.com/DataDog/zstd/README.md | 114 - vendor/github.com/DataDog/zstd/ZSTD_LICENSE | 26 - vendor/github.com/DataDog/zstd/bitstream.h | 375 - vendor/github.com/DataDog/zstd/config.h | 83 - vendor/github.com/DataDog/zstd/divsufsort.c | 404 - vendor/github.com/DataDog/zstd/divsufsort.h | 180 - .../DataDog/zstd/divsufsort_private.h | 212 - .../github.com/DataDog/zstd/error_private.h | 118 - vendor/github.com/DataDog/zstd/error_public.h | 71 - vendor/github.com/DataDog/zstd/fse.c | 1172 - vendor/github.com/DataDog/zstd/fse.h | 295 - vendor/github.com/DataDog/zstd/fse_static.h | 336 - vendor/github.com/DataDog/zstd/huff0.c | 1728 -- vendor/github.com/DataDog/zstd/huff0.h | 97 - vendor/github.com/DataDog/zstd/huff0_static.h | 139 - vendor/github.com/DataDog/zstd/lfs.h | 56 - vendor/github.com/DataDog/zstd/mem.h | 277 - vendor/github.com/DataDog/zstd/sssort.c | 844 - vendor/github.com/DataDog/zstd/trsort.c | 615 - vendor/github.com/DataDog/zstd/zstd.go | 173 - vendor/github.com/DataDog/zstd/zstd.h | 158 - .../github.com/DataDog/zstd/zstd_buffered.c | 548 - .../github.com/DataDog/zstd/zstd_buffered.h | 170 - .../DataDog/zstd/zstd_buffered_static.h | 62 - .../github.com/DataDog/zstd/zstd_compress.c | 2375 -- .../github.com/DataDog/zstd/zstd_decompress.c | 1164 - .../github.com/DataDog/zstd/zstd_internal.h | 136 - vendor/github.com/DataDog/zstd/zstd_static.h | 241 - vendor/github.com/DataDog/zstd/zstd_stream.go | 263 - .../github.com/Masterminds/semver/.travis.yml | 27 + .../Masterminds/semver/CHANGELOG.md | 146 +- .../github.com/Masterminds/semver/LICENSE.txt | 3 +- vendor/github.com/Masterminds/semver/Makefile | 63 +- .../github.com/Masterminds/semver/README.md | 227 +- .../Masterminds/semver/appveyor.yml | 44 + .../Masterminds/semver/constraints.go | 284 +- vendor/github.com/Masterminds/semver/doc.go | 113 +- vendor/github.com/Masterminds/semver/fuzz.go | 22 - vendor/github.com/Masterminds/semver/go.mod | 3 - .../github.com/Masterminds/semver/version.go | 240 +- .../github.com/Microsoft/go-winio/.gitignore | 1 + vendor/github.com/Microsoft/go-winio/go.mod | 2 +- vendor/github.com/Microsoft/go-winio/go.sum | 2 + .../hcsshim/osversion/windowsbuilds.go | 2 +- vendor/github.com/Shopify/sarama/.gitignore | 27 + vendor/github.com/Shopify/sarama/.travis.yml | 38 + vendor/github.com/Shopify/sarama/CHANGELOG.md | 56 + vendor/github.com/Shopify/sarama/Makefile | 12 +- vendor/github.com/Shopify/sarama/README.md | 23 +- vendor/github.com/Shopify/sarama/admin.go | 23 +- .../Shopify/sarama/async_producer.go | 24 +- .../Shopify/sarama/balance_strategy.go | 928 +- vendor/github.com/Shopify/sarama/broker.go | 123 +- vendor/github.com/Shopify/sarama/client.go | 9 + vendor/github.com/Shopify/sarama/compress.go | 2 +- vendor/github.com/Shopify/sarama/config.go | 2 +- .../Shopify/sarama/consumer_group.go | 76 +- .../sarama/describe_log_dirs_request.go | 83 + .../sarama/describe_log_dirs_response.go | 219 + vendor/github.com/Shopify/sarama/dev.yml | 10 + vendor/github.com/Shopify/sarama/errors.go | 3 + vendor/github.com/Shopify/sarama/go.mod | 11 +- vendor/github.com/Shopify/sarama/go.sum | 26 +- .../Shopify/sarama/gssapi_kerberos.go | 9 +- .../Shopify/sarama/mockresponses.go | 28 +- vendor/github.com/Shopify/sarama/request.go | 2 + .../sarama/sticky_assignor_user_data.go | 124 + vendor/github.com/Shopify/sarama/zstd.go | 27 + vendor/github.com/Shopify/sarama/zstd_cgo.go | 13 - .../Shopify/sarama/zstd_fallback.go | 17 - .../aerospike/aerospike-client-go/.build.yml | 16 + .../aerospike/aerospike-client-go/.gitignore | 9 + .../aerospike/aerospike-client-go/.travis.yml | 65 + .../aerospike-client-go/pkg/bcrypt/.gitignore | 5 + vendor/github.com/andrewkroh/sys/AUTHORS | 3 + vendor/github.com/andrewkroh/sys/CONTRIBUTORS | 3 + vendor/github.com/armon/go-socks5/.gitignore | 22 + vendor/github.com/armon/go-socks5/.travis.yml | 4 + .../github.com/aws/aws-lambda-go/Gopkg.lock | 33 - .../github.com/aws/aws-lambda-go/Gopkg.toml | 21 - vendor/github.com/aws/aws-lambda-go/README.md | 85 - .../github.com/aws/aws-sdk-go-v2/CHANGELOG.md | 325 - .../aws/aws-sdk-go-v2/CHANGELOG_PENDING.md | 5 - .../aws/aws-sdk-go-v2/CODE_OF_CONDUCT.md | 4 - .../aws/aws-sdk-go-v2/CONTRIBUTING.md | 127 - .../github.com/aws/aws-sdk-go-v2/Gopkg.lock | 16 - .../github.com/aws/aws-sdk-go-v2/Gopkg.toml | 43 - vendor/github.com/aws/aws-sdk-go-v2/Makefile | 201 - .../github.com/aws/aws-sdk-go-v2/NOTICE.txt | 3 + vendor/github.com/aws/aws-sdk-go-v2/README.md | 92 - .../aws/aws-sdk-go-v2/aws/client.go | 2 +- .../aws/ec2metadata/api_client.go | 2 +- .../aws/aws-sdk-go-v2/aws/signer/v4/v4.go | 38 +- .../aws/aws-sdk-go-v2/cleanup_models.sh | 9 - vendor/github.com/aws/aws-sdk-go-v2/doc.go | 65 - vendor/github.com/aws/aws-sdk-go-v2/go.mod | 12 - vendor/github.com/aws/aws-sdk-go-v2/go.sum | 19 - .../service/iam/iamiface/interface.go | 352 - vendor/github.com/awslabs/goformation/LICENSE | 201 - .../awslabs/goformation/v4/CHANGELOG.md | 236 - .../awslabs/goformation/v4/CODE_OF_CONDUCT.md | 46 - .../awslabs/goformation/v4/CONTRIBUTING.md | 204 - .../awslabs/goformation/v4/README.md | 248 - .../github.com/awslabs/goformation/v4/go.mod | 13 - .../github.com/awslabs/goformation/v4/go.sum | 49 - .../awslabs/goformation/v4/goformation.go | 84 - .../github.com/awslabs/goformation/v4/test.go | 1 - .../beorn7/perks/quantile/exampledata.txt | 2388 ++ vendor/github.com/blakesmith/ar/.gitignore | 1 + .../bradleyfalzon/ghinstallation/AUTHORS | 6 + .../bradleyfalzon/ghinstallation/LICENSE | 191 + .../bradleyfalzon/ghinstallation/README.md | 92 + .../ghinstallation/appsTransport.go | 84 + .../bradleyfalzon/ghinstallation/go.mod | 9 + .../bradleyfalzon/ghinstallation/go.sum | 17 + .../bradleyfalzon/ghinstallation/transport.go | 191 + .../github.com/bsm/sarama-cluster/.gitignore | 4 + .../github.com/bsm/sarama-cluster/.travis.yml | 18 + vendor/github.com/cavaliercoder/badio/LICENSE | 18 - .../github.com/cavaliercoder/badio/Makefile | 11 - .../github.com/cavaliercoder/badio/README.md | 47 - .../cavaliercoder/badio/break_reader.go | 44 - .../cavaliercoder/badio/byte_reader.go | 30 - vendor/github.com/cavaliercoder/badio/doc.go | 5 - .../github.com/cavaliercoder/badio/errors.go | 27 - .../cavaliercoder/badio/random_reader.go | 18 - .../cavaliercoder/badio/sequence_reader.go | 38 - .../cavaliercoder/badio/truncate_reader.go | 36 - .../cavaliercoder/go-rpm/.gitignore | 9 + .../go-rpm/version/vercmp_test.py | 0 .../gen-go/agent/common/v1/common.pb.go | 361 - .../agent/metrics/v1/metrics_service.pb.go | 275 - .../agent/metrics/v1/metrics_service.pb.gw.go | 150 - .../gen-go/agent/trace/v1/trace_service.pb.go | 457 - .../agent/trace/v1/trace_service.pb.gw.go | 150 - .../gen-go/metrics/v1/metrics.pb.go | 1127 - .../gen-go/resource/v1/resource.pb.go | 100 - .../gen-go/trace/v1/trace.pb.go | 1553 -- .../gen-go/trace/v1/trace_config.pb.go | 359 - .../github.com/cespare/xxhash/v2/.travis.yml | 8 + .../cespare/xxhash/{ => v2}/LICENSE.txt | 0 .../cespare/xxhash/{ => v2}/README.md | 0 .../github.com/cespare/xxhash/{ => v2}/go.mod | 0 .../github.com/cespare/xxhash/{ => v2}/go.sum | 0 .../cespare/xxhash/{ => v2}/xxhash.go | 0 .../cespare/xxhash/v2/xxhash_amd64.go | 13 + .../cespare/xxhash/{ => v2}/xxhash_amd64.s | 0 .../cespare/xxhash/{ => v2}/xxhash_other.go | 0 .../cespare/xxhash/{ => v2}/xxhash_safe.go | 0 .../cespare/xxhash/{ => v2}/xxhash_unsafe.go | 0 vendor/github.com/cloudflare/cfssl/LICENSE | 24 - vendor/github.com/cloudflare/cfssl/api/api.go | 231 - .../github.com/cloudflare/cfssl/auth/auth.go | 94 - .../cloudflare/cfssl/certdb/README.md | 75 - .../cloudflare/cfssl/certdb/certdb.go | 42 - .../cloudflare/cfssl/config/config.go | 710 - .../cloudflare/cfssl/crypto/pkcs7/pkcs7.go | 188 - vendor/github.com/cloudflare/cfssl/csr/csr.go | 430 - .../github.com/cloudflare/cfssl/errors/doc.go | 46 - .../cloudflare/cfssl/errors/error.go | 438 - .../cloudflare/cfssl/errors/http.go | 47 - .../cfssl/helpers/derhelpers/derhelpers.go | 48 - .../cfssl/helpers/derhelpers/ed25519.go | 133 - .../cloudflare/cfssl/helpers/helpers.go | 590 - .../github.com/cloudflare/cfssl/info/info.go | 15 - .../cloudflare/cfssl/initca/initca.go | 249 - vendor/github.com/cloudflare/cfssl/log/log.go | 162 - .../cloudflare/cfssl/ocsp/config/config.go | 13 - .../cloudflare/cfssl/signer/local/local.go | 673 - .../cloudflare/cfssl/signer/signer.go | 438 - .../go-cfclient/.gitignore | 30 + .../go-cfclient/.travis.yml | 14 + .../github.com/containerd/continuity/AUTHORS | 16 + .../containerd/continuity/sysx/generate.sh | 0 vendor/github.com/containerd/fifo/.gitignore | 1 + vendor/github.com/containerd/fifo/.travis.yml | 22 + vendor/github.com/coreos/bbolt/.gitignore | 5 + vendor/github.com/coreos/bbolt/appveyor.yml | 18 + vendor/github.com/coreos/etcd/NOTICE | 5 - .../coreos/etcd/raft/raftpb/confchange.go | 170 - .../coreos/etcd/raft/raftpb/confstate.go | 45 - .../coreos/etcd/raft/raftpb/raft.pb.go | 2646 -- .../coreos/etcd/raft/raftpb/raft.proto | 177 - .../coreos/go-systemd/dbus/methods.go | 600 - .../coreos/go-systemd/{ => v22}/LICENSE | 0 .../coreos/go-systemd/{ => v22}/NOTICE | 0 .../go-systemd/{ => v22}/activation/files.go | 0 .../{ => v22}/activation/listeners.go | 4 +- .../{ => v22}/activation/packetconns.go | 0 .../coreos/go-systemd/{ => v22}/dbus/dbus.go | 2 +- .../coreos/go-systemd/v22/dbus/methods.go | 600 + .../go-systemd/{ => v22}/dbus/properties.go | 4 +- .../coreos/go-systemd/{ => v22}/dbus/set.go | 0 .../go-systemd/{ => v22}/dbus/subscription.go | 2 +- .../{ => v22}/dbus/subscription_set.go | 0 .../go-systemd/v22/internal/dlopen/dlopen.go | 82 + .../{ => v22}/sdjournal/functions.go | 2 +- .../go-systemd/{ => v22}/sdjournal/journal.go | 0 .../go-systemd/{ => v22}/sdjournal/read.go | 0 vendor/github.com/coreos/pkg/CONTRIBUTING.md | 71 - vendor/github.com/coreos/pkg/DCO | 36 - vendor/github.com/coreos/pkg/MAINTAINERS | 1 - vendor/github.com/coreos/pkg/README.md | 4 - vendor/github.com/coreos/pkg/build.sh | 3 - .../github.com/coreos/pkg/code-of-conduct.md | 61 - vendor/github.com/coreos/pkg/test.sh | 56 - vendor/github.com/davecgh/go-spew/LICENSE | 2 +- .../github.com/davecgh/go-spew/spew/bypass.go | 187 +- .../davecgh/go-spew/spew/bypasssafe.go | 2 +- .../github.com/davecgh/go-spew/spew/common.go | 2 +- .../github.com/davecgh/go-spew/spew/dump.go | 10 +- .../github.com/davecgh/go-spew/spew/format.go | 4 +- .../denisenkom/go-mssqldb/appveyor.yml | 48 + vendor/github.com/devigned/tab/.gitignore | 14 + vendor/github.com/devigned/tab/.travis.yml | 17 + vendor/github.com/dgrijalva/jwt-go/.gitignore | 4 + .../github.com/dgrijalva/jwt-go/.travis.yml | 13 + .../digitalocean/go-libvirt/.travis.yml | 62 + .../github.com/dimchansky/utfbom/.gitignore | 37 + .../github.com/dimchansky/utfbom/.travis.yml | 18 + vendor/github.com/dlclark/regexp2/.gitignore | 27 + vendor/github.com/dlclark/regexp2/.travis.yml | 5 + .../distribution/reference/normalize.go | 29 - .../distribution/reference/reference.go | 2 +- .../registry/api/errcode/errors.go | 6 +- .../registry/api/errcode/handler.go | 2 +- vendor/github.com/docker/docker/AUTHORS | 2080 ++ .../docker/daemon/cluster/convert/config.go | 78 - .../daemon/cluster/convert/container.go | 466 - .../docker/daemon/cluster/convert/network.go | 240 - .../docker/daemon/cluster/convert/node.go | 94 - .../docker/daemon/cluster/convert/secret.go | 80 - .../docker/daemon/cluster/convert/service.go | 641 - .../docker/daemon/cluster/convert/swarm.go | 150 - .../docker/daemon/cluster/convert/task.go | 69 - .../docker/docker/opts/address_pools.go | 84 - vendor/github.com/docker/docker/opts/env.go | 48 - vendor/github.com/docker/docker/opts/hosts.go | 176 - .../docker/docker/opts/hosts_unix.go | 8 - .../docker/docker/opts/hosts_windows.go | 4 - vendor/github.com/docker/docker/opts/ip.go | 47 - vendor/github.com/docker/docker/opts/opts.go | 337 - .../docker/docker/opts/opts_unix.go | 6 - .../docker/docker/opts/opts_windows.go | 56 - .../docker/docker/opts/quotedstring.go | 37 - .../github.com/docker/docker/opts/runtime.go | 79 - .../github.com/docker/docker/opts/ulimit.go | 81 - .../docker/pkg/homedir/homedir_linux.go | 109 - .../docker/pkg/homedir/homedir_others.go | 33 - .../docker/docker/pkg/homedir/homedir_unix.go | 34 - .../docker/pkg/homedir/homedir_windows.go | 24 - .../pkg/namesgenerator/names-generator.go | 847 - .../docker/docker/pkg/stdcopy/stdcopy.go | 190 - .../docker/go-connections/nat/nat.go | 2 +- .../docker/go-connections/tlsconfig/config.go | 26 +- .../docker/go-events/CONTRIBUTING.md | 70 - vendor/github.com/docker/go-events/LICENSE | 201 - .../github.com/docker/go-events/MAINTAINERS | 46 - vendor/github.com/docker/go-events/README.md | 117 - .../github.com/docker/go-events/broadcast.go | 178 - vendor/github.com/docker/go-events/channel.go | 61 - vendor/github.com/docker/go-events/errors.go | 10 - vendor/github.com/docker/go-events/event.go | 15 - vendor/github.com/docker/go-events/filter.go | 52 - vendor/github.com/docker/go-events/queue.go | 111 - vendor/github.com/docker/go-events/retry.go | 260 - .../sdk/unix_listener_systemd.go | 2 +- vendor/github.com/docker/go-units/MAINTAINERS | 33 +- vendor/github.com/docker/go-units/circle.yml | 11 + vendor/github.com/docker/go-units/duration.go | 2 +- vendor/github.com/docker/go-units/size.go | 2 +- vendor/github.com/docker/go-units/ulimit.go | 9 +- vendor/github.com/docker/libkv/LICENSE.code | 191 - vendor/github.com/docker/libkv/LICENSE.docs | 425 - vendor/github.com/docker/libkv/MAINTAINERS | 40 - vendor/github.com/docker/libkv/README.md | 107 - vendor/github.com/docker/libkv/libkv.go | 40 - .../github.com/docker/libkv/store/helpers.go | 47 - vendor/github.com/docker/libkv/store/store.go | 132 - .../docker/libnetwork/datastore/cache.go | 178 - .../docker/libnetwork/datastore/datastore.go | 660 - .../docker/libnetwork/datastore/mock_store.go | 129 - .../libnetwork/discoverapi/discoverapi.go | 60 - .../docker/libnetwork/ipamutils/utils.go | 135 - .../docker/libnetwork/types/types.go | 653 - .../docker/libtrust/CONTRIBUTING.md | 13 - vendor/github.com/docker/libtrust/LICENSE | 191 - vendor/github.com/docker/libtrust/MAINTAINERS | 3 - vendor/github.com/docker/libtrust/README.md | 22 - .../docker/libtrust/certificates.go | 175 - vendor/github.com/docker/libtrust/doc.go | 9 - vendor/github.com/docker/libtrust/ec_key.go | 428 - vendor/github.com/docker/libtrust/filter.go | 50 - vendor/github.com/docker/libtrust/hash.go | 56 - vendor/github.com/docker/libtrust/jsonsign.go | 657 - vendor/github.com/docker/libtrust/key.go | 253 - .../github.com/docker/libtrust/key_files.go | 255 - .../github.com/docker/libtrust/key_manager.go | 175 - vendor/github.com/docker/libtrust/rsa_key.go | 427 - vendor/github.com/docker/libtrust/util.go | 363 - vendor/github.com/docker/swarmkit/LICENSE | 201 - .../github.com/docker/swarmkit/api/README.md | 24 - .../github.com/docker/swarmkit/api/ca.pb.go | 2340 -- .../github.com/docker/swarmkit/api/ca.proto | 72 - .../docker/swarmkit/api/control.pb.go | 20801 ---------------- .../docker/swarmkit/api/control.proto | 782 - .../docker/swarmkit/api/deepcopy/copy.go | 59 - .../docker/swarmkit/api/dispatcher.pb.go | 3830 --- .../docker/swarmkit/api/dispatcher.proto | 218 - .../docker/swarmkit/api/equality/equality.go | 67 - .../swarmkit/api/genericresource/helpers.go | 111 - .../swarmkit/api/genericresource/parse.go | 111 - .../genericresource/resource_management.go | 203 - .../swarmkit/api/genericresource/string.go | 54 - .../swarmkit/api/genericresource/validate.go | 85 - .../docker/swarmkit/api/health.pb.go | 703 - .../docker/swarmkit/api/health.proto | 34 - .../docker/swarmkit/api/logbroker.pb.go | 3400 --- .../docker/swarmkit/api/logbroker.proto | 188 - .../docker/swarmkit/api/naming/naming.go | 49 - .../docker/swarmkit/api/objects.pb.go | 8386 ------- .../docker/swarmkit/api/objects.proto | 504 - .../github.com/docker/swarmkit/api/raft.pb.go | 4008 --- .../github.com/docker/swarmkit/api/raft.proto | 150 - .../docker/swarmkit/api/resource.pb.go | 1075 - .../docker/swarmkit/api/resource.proto | 34 - .../docker/swarmkit/api/snapshot.pb.go | 1326 - .../docker/swarmkit/api/snapshot.proto | 44 - .../docker/swarmkit/api/specs.pb.go | 6966 ------ .../docker/swarmkit/api/specs.proto | 474 - .../docker/swarmkit/api/storeobject.go | 123 - .../docker/swarmkit/api/types.pb.go | 17932 ------------- .../docker/swarmkit/api/types.proto | 1117 - .../docker/swarmkit/api/watch.pb.go | 4581 ---- .../docker/swarmkit/api/watch.proto | 154 - vendor/github.com/docker/swarmkit/ca/auth.go | 247 - .../docker/swarmkit/ca/certificates.go | 954 - .../github.com/docker/swarmkit/ca/config.go | 719 - .../github.com/docker/swarmkit/ca/external.go | 230 - .../github.com/docker/swarmkit/ca/forward.go | 78 - .../docker/swarmkit/ca/keyreadwriter.go | 493 - .../docker/swarmkit/ca/keyutils/keyutils.go | 101 - .../docker/swarmkit/ca/pkcs8/pkcs8.go | 311 - .../docker/swarmkit/ca/reconciler.go | 259 - .../github.com/docker/swarmkit/ca/renewer.go | 168 - .../github.com/docker/swarmkit/ca/server.go | 917 - .../docker/swarmkit/ca/transport.go | 207 - .../swarmkit/connectionbroker/broker.go | 123 - .../docker/swarmkit/identity/combined_id.go | 8 - .../docker/swarmkit/identity/doc.go | 16 - .../docker/swarmkit/identity/randomid.go | 53 - .../docker/swarmkit/ioutils/ioutils.go | 40 - .../github.com/docker/swarmkit/log/context.go | 96 - vendor/github.com/docker/swarmkit/log/grpc.go | 31 - .../manager/raftselector/raftselector.go | 19 - .../docker/swarmkit/manager/state/proposer.go | 31 - .../swarmkit/manager/state/store/apply.go | 49 - .../docker/swarmkit/manager/state/store/by.go | 214 - .../swarmkit/manager/state/store/clusters.go | 128 - .../manager/state/store/combinators.go | 14 - .../swarmkit/manager/state/store/configs.go | 122 - .../swarmkit/manager/state/store/doc.go | 32 - .../manager/state/store/extensions.go | 188 - .../swarmkit/manager/state/store/memory.go | 979 - .../swarmkit/manager/state/store/networks.go | 122 - .../swarmkit/manager/state/store/nodes.go | 166 - .../swarmkit/manager/state/store/object.go | 58 - .../swarmkit/manager/state/store/resources.go | 214 - .../swarmkit/manager/state/store/secrets.go | 122 - .../swarmkit/manager/state/store/services.go | 238 - .../swarmkit/manager/state/store/tasks.go | 331 - .../docker/swarmkit/manager/state/watch.go | 74 - .../swarmkit/protobuf/plugin/helpers.go | 11 - .../swarmkit/protobuf/plugin/plugin.pb.go | 1225 - .../swarmkit/protobuf/plugin/plugin.proto | 53 - .../docker/swarmkit/remotes/remotes.go | 203 - .../docker/swarmkit/watch/queue/queue.go | 158 - .../github.com/docker/swarmkit/watch/sinks.go | 95 - .../github.com/docker/swarmkit/watch/watch.go | 197 - vendor/github.com/dop251/goja/.gitignore | 3 + vendor/github.com/dop251/goja/parser/lexer.go | 2 +- .../github.com/dop251/goja/parser/parser.go | 6 +- .../github.com/dop251/goja/parser/regexp.go | 1 + .../dop251/goja/parser/statement.go | 8 +- vendor/github.com/dop251/goja/token/tokenfmt | 0 .../github.com/dustin/go-humanize/.travis.yml | 21 + .../dustin/go-humanize/README.markdown | 32 + vendor/github.com/dustin/go-humanize/comma.go | 2 +- vendor/github.com/dustin/go-humanize/times.go | 2 +- .../eapache/go-xerial-snappy/.gitignore | 24 + .../eapache/go-xerial-snappy/.travis.yml | 7 + .../eapache/go-xerial-snappy/fuzz.go | 16 + .../eapache/go-xerial-snappy/snappy.go | 110 +- vendor/github.com/eapache/queue/.gitignore | 23 + vendor/github.com/eapache/queue/.travis.yml | 7 + .../eclipse/paho.mqtt.golang/.gitignore | 36 + vendor/github.com/elastic/ecs/NOTICE.txt | 14 + .../github.com/elastic/go-libaudit/.gitignore | 31 + .../elastic/go-libaudit/.travis.yml | 32 + .../github.com/elastic/go-libaudit/NOTICE.txt | 5 + .../go-libaudit/rule/defs_kernel_types.go | 173 - .../github.com/elastic/go-licenser/.gitignore | 3 + .../elastic/go-licenser/.goreleaser.yml | 32 + .../elastic/go-licenser/.travis.yml | 22 + .../github.com/elastic/go-licenser/Makefile | 3 +- .../github.com/elastic/go-licenser/README.md | 5 +- .../elastic/go-licenser/appveyor.yml | 38 + vendor/github.com/elastic/go-licenser/main.go | 42 +- .../elastic/go-lookslike/.gitignore | 1 + .../elastic/go-lookslike/.travis.yml | 13 + .../elastic/go-seccomp-bpf/.gitignore | 9 + .../elastic/go-seccomp-bpf/.travis.yml | 25 + .../elastic/go-seccomp-bpf/CHANGELOG.md | 24 + .../elastic/go-seccomp-bpf/NOTICE.txt | 5 + .../cmd/seccomp-profiler/disasm/disasm.go | 244 - .../cmd/seccomp-profiler/main.go | 451 - .../elastic/go-structform/.gitignore | 14 + .../elastic/go-structform/.travis.yml | 9 + .../go-structform/gotype/fold_map_inline.yml | 81 + .../go-structform/gotype/fold_refl_sel.yml | 47 + .../elastic/go-structform/gotype/stacks.yml | 65 + .../elastic/go-structform/gotype/types.yml | 68 + .../go-structform/gotype/unfold_arr.yml | 169 + .../go-structform/gotype/unfold_err.yml | 63 + .../go-structform/gotype/unfold_ignore.yml | 107 + .../go-structform/gotype/unfold_lookup_go.yml | 208 + .../go-structform/gotype/unfold_map.yml | 177 + .../go-structform/gotype/unfold_primitive.yml | 89 + .../go-structform/gotype/unfold_refl.yml | 138 + .../go-structform/gotype/unfold_templates.yml | 119 + .../gotype/unfold_user_primitive.yml | 82 + .../gotype/unfold_user_processing.yml | 175 + .../elastic/go-sysinfo/.appveyor.yml | 61 + .../elastic/go-sysinfo/.editorconfig | 27 + .../elastic/go-sysinfo/.gitattributes | 5 + .../github.com/elastic/go-sysinfo/.gitignore | 11 + .../github.com/elastic/go-sysinfo/.travis.yml | 27 + .../elastic/go-sysinfo/CHANGELOG.md | 1 + .../github.com/elastic/go-sysinfo/README.md | 1 + vendor/github.com/elastic/go-sysinfo/go.mod | 4 +- vendor/github.com/elastic/go-sysinfo/go.sum | 4 +- .../github.com/elastic/go-txfile/.gitignore | 17 + .../github.com/elastic/go-txfile/.travis.yml | 80 + .../elastic/go-txfile/meta_sizing.py | 6 +- .../github.com/elastic/go-ucfg/.editorconfig | 27 + vendor/github.com/elastic/go-ucfg/.gitignore | 1 + vendor/github.com/elastic/go-ucfg/.travis.yml | 14 + .../github.com/elastic/go-ucfg/diff/keys.go | 122 - .../github.com/elastic/go-ucfg/hjson/hjson.go | 49 - .../elastic/go-windows/.appveyor.yml | 61 + .../elastic/go-windows/.gitattributes | 5 + .../github.com/elastic/go-windows/.gitignore | 24 + .../github.com/elastic/go-windows/.travis.yml | 25 + .../github.com/elastic/go-windows/NOTICE.txt | 5 + .../github.com/elastic/gosigar/.appveyor.yml | 84 + vendor/github.com/elastic/gosigar/.gitignore | 41 + vendor/github.com/elastic/gosigar/.travis.yml | 37 + vendor/github.com/elastic/gosigar/codecov.yml | 21 + .../gosigar/sys/windows/fix_generated.go | 60 - vendor/github.com/fatih/color/.travis.yml | 5 + .../fsnotify/fsevents/.editorconfig | 5 + .../github.com/fsnotify/fsevents/.gitignore | 1 + .../github.com/fsnotify/fsevents/.travis.yml | 40 + .../github.com/fsnotify/fsevents/circle.yml | 24 + .../fsnotify/fsevents/example/main.go | 101 - .../fsnotify/fsnotify/.editorconfig | 5 + .../github.com/fsnotify/fsnotify/.gitignore | 6 + .../github.com/fsnotify/fsnotify/.travis.yml | 30 + vendor/github.com/ghodss/yaml/LICENSE | 50 - vendor/github.com/ghodss/yaml/README.md | 121 - vendor/github.com/ghodss/yaml/fields.go | 501 - vendor/github.com/ghodss/yaml/yaml.go | 277 - vendor/github.com/go-ini/ini/LICENSE | 191 - vendor/github.com/go-ini/ini/Makefile | 15 - vendor/github.com/go-ini/ini/README.md | 46 - vendor/github.com/go-ini/ini/error.go | 32 - vendor/github.com/go-ini/ini/file.go | 414 - vendor/github.com/go-ini/ini/ini.go | 211 - vendor/github.com/go-ini/ini/key.go | 751 - vendor/github.com/go-ini/ini/parser.go | 494 - vendor/github.com/go-ini/ini/section.go | 258 - vendor/github.com/go-ini/ini/struct.go | 512 - vendor/github.com/go-ole/go-ole/.travis.yml | 8 + vendor/github.com/go-ole/go-ole/appveyor.yml | 54 + .../go-sourcemap/sourcemap/.travis.yml | 12 + .../github.com/go-sql-driver/mysql/.gitignore | 9 + .../go-sql-driver/mysql/.travis.yml | 107 + vendor/github.com/gocarina/gocsv/.travis.yml | 1 + vendor/github.com/godbus/dbus/v5/.travis.yml | 50 + .../godbus/dbus/{ => v5}/CONTRIBUTING.md | 0 .../github.com/godbus/dbus/{ => v5}/LICENSE | 0 .../godbus/dbus/{ => v5}/MAINTAINERS | 0 .../godbus/dbus/{ => v5}/README.markdown | 0 .../github.com/godbus/dbus/{ => v5}/auth.go | 0 .../godbus/dbus/{ => v5}/auth_anonymous.go | 0 .../godbus/dbus/{ => v5}/auth_external.go | 0 .../godbus/dbus/{ => v5}/auth_sha1.go | 0 .../github.com/godbus/dbus/{ => v5}/call.go | 0 .../github.com/godbus/dbus/{ => v5}/conn.go | 0 .../godbus/dbus/{ => v5}/conn_darwin.go | 0 .../godbus/dbus/{ => v5}/conn_other.go | 0 .../godbus/dbus/{ => v5}/conn_unix.go | 0 .../godbus/dbus/{ => v5}/conn_windows.go | 0 .../github.com/godbus/dbus/{ => v5}/dbus.go | 0 .../godbus/dbus/{ => v5}/decoder.go | 0 .../godbus/dbus/{ => v5}/default_handler.go | 0 vendor/github.com/godbus/dbus/{ => v5}/doc.go | 0 .../godbus/dbus/{ => v5}/encoder.go | 0 .../github.com/godbus/dbus/{ => v5}/export.go | 0 vendor/github.com/godbus/dbus/{ => v5}/go.mod | 0 vendor/github.com/godbus/dbus/{ => v5}/go.sum | 0 .../godbus/dbus/{ => v5}/homedir.go | 0 .../godbus/dbus/{ => v5}/homedir_dynamic.go | 0 .../godbus/dbus/{ => v5}/homedir_static.go | 0 .../github.com/godbus/dbus/{ => v5}/match.go | 0 .../godbus/dbus/{ => v5}/message.go | 0 .../github.com/godbus/dbus/{ => v5}/object.go | 0 .../godbus/dbus/{ => v5}/server_interfaces.go | 0 vendor/github.com/godbus/dbus/{ => v5}/sig.go | 0 .../godbus/dbus/{ => v5}/transport_darwin.go | 0 .../godbus/dbus/{ => v5}/transport_generic.go | 0 .../dbus/{ => v5}/transport_nonce_tcp.go | 0 .../godbus/dbus/{ => v5}/transport_tcp.go | 0 .../godbus/dbus/{ => v5}/transport_unix.go | 0 .../{ => v5}/transport_unixcred_dragonfly.go | 0 .../{ => v5}/transport_unixcred_freebsd.go | 0 .../dbus/{ => v5}/transport_unixcred_linux.go | 0 .../{ => v5}/transport_unixcred_openbsd.go | 0 .../godbus/dbus/{ => v5}/variant.go | 0 .../godbus/dbus/{ => v5}/variant_lexer.go | 0 .../godbus/dbus/{ => v5}/variant_parser.go | 0 vendor/github.com/godror/godror/.gitignore | 7 + vendor/github.com/godror/godror/.golangci.yml | 19 + vendor/github.com/godror/godror/.travis.yml | 31 + .../godror/godror/contrib/free.db/cwallet.sso | Bin 6733 -> 0 bytes .../godror/godror/contrib/free.db/env.sh | 5 - .../godror/godror/contrib/free.db/ewallet.p12 | Bin 6688 -> 0 bytes .../godror/contrib/free.db/keystore.jks | Bin 3241 -> 0 bytes .../godror/contrib/free.db/ojdbc.properties | 1 - .../godror/godror/contrib/free.db/reset.sql | 15 - .../godror/godror/contrib/free.db/sqlnet.ora | 2 - .../godror/contrib/free.db/tnsnames.ora | 6 - .../godror/contrib/free.db/truststore.jks | Bin 3335 -> 0 bytes .../contrib/oracle-instant-client/Dockerfile | 14 - .../contrib/oracle-instant-client/README.md | 3 - .../godror/contrib/oracle-xe-18c/Dockerfile | 19 - .../godror/contrib/oracle-xe-18c/README.md | 15 - vendor/github.com/godror/godror/sid/sid.go | 531 - vendor/github.com/gofrs/flock/.gitignore | 24 + vendor/github.com/gofrs/flock/.travis.yml | 10 + vendor/github.com/gofrs/uuid/.gitignore | 15 + vendor/github.com/gofrs/uuid/.travis.yml | 23 + vendor/github.com/gofrs/uuid/README.md | 10 +- vendor/github.com/gofrs/uuid/codec.go | 10 +- vendor/github.com/gofrs/uuid/go.mod | 1 - vendor/github.com/gofrs/uuid/sql.go | 4 + vendor/github.com/gogo/protobuf/AUTHORS | 15 + vendor/github.com/gogo/protobuf/CONTRIBUTORS | 23 + .../gogo/protobuf/gogoproto/gogo.pb.go | 2 +- .../github.com/gogo/protobuf/proto/encode.go | 2 + vendor/github.com/gogo/protobuf/proto/lib.go | 20 +- .../gogo/protobuf/proto/properties.go | 71 +- .../gogo/protobuf/proto/table_marshal.go | 17 +- .../gogo/protobuf/proto/table_merge.go | 19 + .../gogo/protobuf/proto/table_unmarshal.go | 22 +- vendor/github.com/gogo/protobuf/proto/text.go | 6 +- .../descriptor/descriptor.pb.go | 10 +- vendor/github.com/gogo/protobuf/types/any.go | 140 - .../github.com/gogo/protobuf/types/any.pb.go | 723 - .../github.com/gogo/protobuf/types/api.pb.go | 2169 -- vendor/github.com/gogo/protobuf/types/doc.go | 35 - .../gogo/protobuf/types/duration.go | 100 - .../gogo/protobuf/types/duration.pb.go | 546 - .../gogo/protobuf/types/duration_gogo.go | 100 - .../gogo/protobuf/types/empty.pb.go | 491 - .../gogo/protobuf/types/field_mask.pb.go | 767 - .../gogo/protobuf/types/protosize.go | 34 - .../gogo/protobuf/types/source_context.pb.go | 553 - .../gogo/protobuf/types/struct.pb.go | 2423 -- .../gogo/protobuf/types/timestamp.go | 130 - .../gogo/protobuf/types/timestamp.pb.go | 566 - .../gogo/protobuf/types/timestamp_gogo.go | 94 - .../github.com/gogo/protobuf/types/type.pb.go | 3396 --- .../gogo/protobuf/types/wrappers.pb.go | 2756 -- .../gogo/protobuf/types/wrappers_gogo.go | 300 - vendor/github.com/golang/glog/README | 44 - vendor/github.com/golang/glog/glog.go | 1180 - vendor/github.com/golang/glog/glog_file.go | 124 - .../golang/{glog => groupcache}/LICENSE | 0 .../github.com/golang/groupcache/lru/lru.go | 133 + vendor/github.com/golang/protobuf/AUTHORS | 3 + .../github.com/golang/protobuf/CONTRIBUTORS | 3 + .../golang/protobuf/proto/properties.go | 5 +- .../golang/protobuf/protoc-gen-go/doc.go | 51 + .../protobuf/protoc-gen-go/grpc/grpc.go | 537 + .../protobuf/protoc-gen-go/link_grpc.go | 34 + .../golang/protobuf/protoc-gen-go/main.go | 98 + vendor/github.com/golang/snappy/.gitignore | 16 + vendor/github.com/golang/snappy/go.mod | 1 + vendor/github.com/golang/snappy/snappy.go | 17 +- .../certificate-transparency-go/AUTHORS | 27 - .../certificate-transparency-go/CHANGELOG.md | 378 - .../CONTRIBUTING.md | 58 - .../certificate-transparency-go/CONTRIBUTORS | 59 - .../PULL_REQUEST_TEMPLATE.md | 16 - .../certificate-transparency-go/README.md | 138 - .../asn1/README.md | 7 - .../certificate-transparency-go/asn1/asn1.go | 1166 - .../asn1/common.go | 186 - .../asn1/marshal.go | 691 - .../client/configpb/gen.go | 17 - .../client/configpb/multilog.pb.go | 162 - .../client/configpb/multilog.proto | 43 - .../client/getentries.go | 71 - .../client/logclient.go | 255 - .../client/multilog.go | 221 - .../cloudbuild.yaml | 46 - .../cloudbuild_master.yaml | 63 - .../cloudbuild_tag.yaml | 10 - .../google/certificate-transparency-go/go.mod | 62 - .../google/certificate-transparency-go/go.sum | 453 - .../jsonclient/backoff.go | 72 - .../jsonclient/client.go | 323 - .../serialization.go | 347 - .../certificate-transparency-go/signatures.go | 110 - .../tls/signature.go | 152 - .../certificate-transparency-go/tls/tls.go | 711 - .../certificate-transparency-go/tls/types.go | 117 - .../certificate-transparency-go/types.go | 545 - .../x509/README.md | 7 - .../x509/cert_pool.go | 159 - .../x509/curves.go | 37 - .../certificate-transparency-go/x509/error.go | 236 - .../x509/errors.go | 302 - .../certificate-transparency-go/x509/names.go | 164 - .../x509/nilref_nil_darwin.go | 26 - .../x509/nilref_zero_darwin.go | 26 - .../x509/pem_decrypt.go | 240 - .../certificate-transparency-go/x509/pkcs1.go | 155 - .../certificate-transparency-go/x509/pkcs8.go | 136 - .../x509/pkix/pkix.go | 286 - .../x509/ptr_sysptr_windows.go | 20 - .../x509/ptr_uint_windows.go | 17 - .../x509/revoked.go | 365 - .../certificate-transparency-go/x509/root.go | 25 - .../x509/root_bsd.go | 15 - .../x509/root_cgo_darwin.go | 306 - .../x509/root_darwin.go | 289 - .../x509/root_darwin_armx.go | 4313 ---- .../x509/root_js.go | 10 - .../x509/root_linux.go | 14 - .../x509/root_nacl.go | 8 - .../x509/root_nocgo_darwin.go | 11 - .../x509/root_plan9.go | 40 - .../x509/root_solaris.go | 12 - .../x509/root_unix.go | 88 - .../x509/root_windows.go | 266 - .../certificate-transparency-go/x509/rpki.go | 242 - .../certificate-transparency-go/x509/sec1.go | 113 - .../x509/test-dir.crt | 31 - .../x509/test-file.crt | 32 - .../x509/verify.go | 1099 - .../certificate-transparency-go/x509/x509.go | 3242 --- .../github.com/google/go-cmp/cmp/compare.go | 83 +- .../google/go-cmp/cmp/export_panic.go | 4 +- .../google/go-cmp/cmp/export_unsafe.go | 6 +- .../google/go-cmp/cmp/internal/value/sort.go | 4 +- .../google/go-cmp/cmp/internal/value/zero.go | 9 +- .../github.com/google/go-cmp/cmp/options.go | 55 +- vendor/github.com/google/go-cmp/cmp/path.go | 71 +- .../google/go-cmp/cmp/report_compare.go | 2 +- .../google/go-cmp/cmp/report_slices.go | 4 +- .../google/go-cmp/cmp/report_text.go | 2 +- .../github.com/google/go-github/v28/AUTHORS | 253 + .../github.com/google/go-github/v28/LICENSE | 27 + .../google/go-github/v28/github/activity.go | 69 + .../go-github/v28/github/activity_events.go | 215 + .../v28/github/activity_notifications.go | 223 + .../go-github/v28/github/activity_star.go | 137 + .../go-github/v28/github/activity_watching.go | 146 + .../google/go-github/v28/github/admin.go | 101 + .../google/go-github/v28/github/admin_orgs.go | 43 + .../go-github/v28/github/admin_stats.go | 171 + .../go-github/v28/github/admin_users.go | 61 + .../google/go-github/v28/github/apps.go | 297 + .../go-github/v28/github/apps_installation.go | 103 + .../go-github/v28/github/apps_marketplace.go | 184 + .../go-github/v28/github/authorizations.go | 435 + .../google/go-github/v28/github/checks.go | 437 + .../google/go-github/v28/github/doc.go | 188 + .../google/go-github/v28/github/event.go | 132 + .../go-github/v28/github/event_types.go | 890 + .../google/go-github/v28/github/gists.go | 363 + .../go-github/v28/github/gists_comments.go | 119 + .../google/go-github/v28/github/git.go | 12 + .../google/go-github/v28/github/git_blobs.go | 69 + .../go-github/v28/github/git_commits.go | 200 + .../google/go-github/v28/github/git_refs.go | 222 + .../google/go-github/v28/github/git_tags.go | 76 + .../google/go-github/v28/github/git_trees.go | 99 + .../go-github/v28/github/github-accessors.go | 13029 ++++++++++ .../google/go-github/v28/github/github.go | 1047 + .../google/go-github/v28/github/gitignore.go | 64 + .../go-github/v28/github/interactions.go | 28 + .../go-github/v28/github/interactions_orgs.go | 80 + .../v28/github/interactions_repos.go | 80 + .../google/go-github/v28/github/issues.go | 347 + .../go-github/v28/github/issues_assignees.go | 85 + .../go-github/v28/github/issues_comments.go | 153 + .../go-github/v28/github/issues_events.go | 175 + .../go-github/v28/github/issues_labels.go | 261 + .../go-github/v28/github/issues_milestones.go | 148 + .../go-github/v28/github/issues_timeline.go | 154 + .../google/go-github/v28/github/licenses.go | 97 + .../google/go-github/v28/github/messages.go | 258 + .../google/go-github/v28/github/migrations.go | 224 + .../v28/github/migrations_source_import.go | 329 + .../go-github/v28/github/migrations_user.go | 214 + .../google/go-github/v28/github/misc.go | 257 + .../google/go-github/v28/github/orgs.go | 215 + .../google/go-github/v28/github/orgs_hooks.go | 118 + .../go-github/v28/github/orgs_members.go | 370 + .../v28/github/orgs_outside_collaborators.go | 81 + .../go-github/v28/github/orgs_projects.go | 60 + .../v28/github/orgs_users_blocking.go | 91 + .../google/go-github/v28/github/projects.go | 594 + .../google/go-github/v28/github/pulls.go | 480 + .../go-github/v28/github/pulls_comments.go | 189 + .../go-github/v28/github/pulls_reviewers.go | 80 + .../go-github/v28/github/pulls_reviews.go | 261 + .../google/go-github/v28/github/reactions.go | 377 + .../google/go-github/v28/github/repos.go | 1303 + .../v28/github/repos_collaborators.go | 137 + .../go-github/v28/github/repos_comments.go | 162 + .../go-github/v28/github/repos_commits.go | 264 + .../v28/github/repos_community_health.go | 59 + .../go-github/v28/github/repos_contents.go | 269 + .../go-github/v28/github/repos_deployments.go | 229 + .../go-github/v28/github/repos_forks.go | 96 + .../go-github/v28/github/repos_hooks.go | 226 + .../go-github/v28/github/repos_invitations.go | 89 + .../google/go-github/v28/github/repos_keys.go | 111 + .../go-github/v28/github/repos_merging.go | 38 + .../go-github/v28/github/repos_pages.go | 190 + .../v28/github/repos_prereceive_hooks.go | 110 + .../go-github/v28/github/repos_projects.go | 69 + .../go-github/v28/github/repos_releases.go | 374 + .../go-github/v28/github/repos_stats.go | 226 + .../go-github/v28/github/repos_statuses.go | 131 + .../go-github/v28/github/repos_traffic.go | 141 + .../google/go-github/v28/github/search.go | 258 + .../google/go-github/v28/github/strings.go | 93 + .../google/go-github/v28/github/teams.go | 562 + .../v28/github/teams_discussion_comments.go | 155 + .../go-github/v28/github/teams_discussions.go | 160 + .../go-github/v28/github/teams_members.go | 174 + .../google/go-github/v28/github/timestamp.go | 41 + .../google/go-github/v28/github/users.go | 278 + .../v28/github/users_administration.go | 72 + .../go-github/v28/github/users_blocking.go | 91 + .../go-github/v28/github/users_emails.go | 72 + .../go-github/v28/github/users_followers.go | 119 + .../go-github/v28/github/users_gpg_keys.go | 128 + .../google/go-github/v28/github/users_keys.go | 109 + .../go-github/v28/github/with_appengine.go | 20 + .../go-github/v28/github/without_appengine.go | 19 + .../github.com/google/go-github/v29/AUTHORS | 276 + .../github.com/google/go-github/v29/LICENSE | 27 + .../google/go-github/v29/github/activity.go | 69 + .../go-github/v29/github/activity_events.go | 215 + .../v29/github/activity_notifications.go | 223 + .../go-github/v29/github/activity_star.go | 137 + .../go-github/v29/github/activity_watching.go | 146 + .../google/go-github/v29/github/admin.go | 119 + .../google/go-github/v29/github/admin_orgs.go | 43 + .../go-github/v29/github/admin_stats.go | 171 + .../go-github/v29/github/admin_users.go | 133 + .../google/go-github/v29/github/apps.go | 303 + .../go-github/v29/github/apps_installation.go | 103 + .../go-github/v29/github/apps_manifest.go | 53 + .../go-github/v29/github/apps_marketplace.go | 184 + .../go-github/v29/github/authorizations.go | 435 + .../google/go-github/v29/github/checks.go | 434 + .../google/go-github/v29/github/doc.go | 188 + .../google/go-github/v29/github/event.go | 136 + .../go-github/v29/github/event_types.go | 922 + .../google/go-github/v29/github/gists.go | 363 + .../go-github/v29/github/gists_comments.go | 119 + .../google/go-github/v29/github/git.go | 12 + .../google/go-github/v29/github/git_blobs.go | 69 + .../go-github/v29/github/git_commits.go | 200 + .../google/go-github/v29/github/git_refs.go | 222 + .../google/go-github/v29/github/git_tags.go | 76 + .../google/go-github/v29/github/git_trees.go | 162 + .../go-github/v29/github/github-accessors.go | 13733 ++++++++++ .../google/go-github/v29/github/github.go | 1056 + .../google/go-github/v29/github/gitignore.go | 64 + .../go-github/v29/github/interactions.go | 28 + .../go-github/v29/github/interactions_orgs.go | 80 + .../v29/github/interactions_repos.go | 80 + .../google/go-github/v29/github/issues.go | 341 + .../go-github/v29/github/issues_assignees.go | 85 + .../go-github/v29/github/issues_comments.go | 153 + .../go-github/v29/github/issues_events.go | 175 + .../go-github/v29/github/issues_labels.go | 231 + .../go-github/v29/github/issues_milestones.go | 148 + .../go-github/v29/github/issues_timeline.go | 154 + .../google/go-github/v29/github/licenses.go | 97 + .../google/go-github/v29/github/messages.go | 260 + .../google/go-github/v29/github/migrations.go | 228 + .../v29/github/migrations_source_import.go | 329 + .../go-github/v29/github/migrations_user.go | 214 + .../google/go-github/v29/github/misc.go | 257 + .../google/go-github/v29/github/orgs.go | 263 + .../google/go-github/v29/github/orgs_hooks.go | 118 + .../go-github/v29/github/orgs_members.go | 364 + .../v29/github/orgs_outside_collaborators.go | 81 + .../go-github/v29/github/orgs_projects.go | 60 + .../v29/github/orgs_users_blocking.go | 91 + .../google/go-github/v29/github/projects.go | 594 + .../google/go-github/v29/github/pulls.go | 483 + .../go-github/v29/github/pulls_comments.go | 201 + .../go-github/v29/github/pulls_reviewers.go | 80 + .../go-github/v29/github/pulls_reviews.go | 261 + .../google/go-github/v29/github/reactions.go | 388 + .../google/go-github/v29/github/repos.go | 1462 ++ .../v29/github/repos_collaborators.go | 152 + .../go-github/v29/github/repos_comments.go | 162 + .../go-github/v29/github/repos_commits.go | 264 + .../v29/github/repos_community_health.go | 59 + .../go-github/v29/github/repos_contents.go | 284 + .../go-github/v29/github/repos_deployments.go | 229 + .../go-github/v29/github/repos_forks.go | 96 + .../go-github/v29/github/repos_hooks.go | 226 + .../go-github/v29/github/repos_invitations.go | 89 + .../google/go-github/v29/github/repos_keys.go | 111 + .../go-github/v29/github/repos_merging.go | 38 + .../go-github/v29/github/repos_pages.go | 181 + .../v29/github/repos_prereceive_hooks.go | 110 + .../go-github/v29/github/repos_projects.go | 69 + .../go-github/v29/github/repos_releases.go | 374 + .../go-github/v29/github/repos_stats.go | 226 + .../go-github/v29/github/repos_statuses.go | 131 + .../go-github/v29/github/repos_traffic.go | 141 + .../google/go-github/v29/github/search.go | 294 + .../google/go-github/v29/github/strings.go | 93 + .../google/go-github/v29/github/teams.go | 570 + .../v29/github/teams_discussion_comments.go | 140 + .../go-github/v29/github/teams_discussions.go | 145 + .../go-github/v29/github/teams_members.go | 170 + .../google/go-github/v29/github/timestamp.go | 41 + .../google/go-github/v29/github/users.go | 275 + .../v29/github/users_administration.go | 72 + .../go-github/v29/github/users_blocking.go | 91 + .../go-github/v29/github/users_emails.go | 72 + .../go-github/v29/github/users_followers.go | 119 + .../go-github/v29/github/users_gpg_keys.go | 128 + .../google/go-github/v29/github/users_keys.go | 109 + .../go-github/v29/github/users_projects.go | 68 + .../go-github/v29/github/with_appengine.go | 20 + .../go-github/v29/github/without_appengine.go | 19 + .../github.com/google/go-querystring/LICENSE | 27 + .../google/go-querystring/query/encode.go | 320 + vendor/github.com/google/gofuzz/.travis.yml | 13 + vendor/github.com/google/gopacket/.gitignore | 38 + .../google/gopacket/.travis.gofmt.sh | 7 + .../google/gopacket/.travis.golint.sh | 28 + .../google/gopacket/.travis.govet.sh | 10 + .../google/gopacket/.travis.install.sh | 9 + .../google/gopacket/.travis.script.sh | 10 + vendor/github.com/google/gopacket/.travis.yml | 56 + .../google/gopacket/afpacket/afpacket.go | 12 +- .../google/gopacket/afpacket/sockopt_linux.go | 46 +- vendor/github.com/google/gopacket/gc | 0 .../google/gopacket/layers/.lint_blacklist | 39 + .../google/gopacket/layers/test_creator.py | 4 +- vendor/github.com/google/uuid/.travis.yml | 9 + .../googleapis/gax-go/{ => v2}/LICENSE | 0 .../gnostic/extensions/COMPILE-EXTENSION.sh | 0 .../github.com/gorilla/websocket/.gitignore | 25 + .../go-grpc-prometheus/CHANGELOG.md | 25 - .../grpc-ecosystem/go-grpc-prometheus/LICENSE | 201 - .../go-grpc-prometheus/README.md | 250 - .../go-grpc-prometheus/client.go | 57 - .../go-grpc-prometheus/client_metrics.go | 244 - .../go-grpc-prometheus/client_reporter.go | 79 - .../grpc-ecosystem/go-grpc-prometheus/go.mod | 10 - .../grpc-ecosystem/go-grpc-prometheus/go.sum | 48 - .../go-grpc-prometheus/makefile | 16 - .../go-grpc-prometheus/metric_options.go | 41 - .../go-grpc-prometheus/server.go | 48 - .../go-grpc-prometheus/server_metrics.go | 186 - .../go-grpc-prometheus/server_reporter.go | 46 - .../grpc-ecosystem/go-grpc-prometheus/util.go | 50 - .../grpc-ecosystem/grpc-gateway/LICENSE.txt | 27 - .../grpc-gateway/internal/BUILD.bazel | 22 - .../grpc-gateway/internal/stream_chunk.pb.go | 118 - .../grpc-gateway/internal/stream_chunk.proto | 15 - .../grpc-gateway/runtime/BUILD.bazel | 84 - .../grpc-gateway/runtime/context.go | 210 - .../grpc-gateway/runtime/convert.go | 312 - .../grpc-gateway/runtime/doc.go | 5 - .../grpc-gateway/runtime/errors.go | 146 - .../grpc-gateway/runtime/fieldmask.go | 70 - .../grpc-gateway/runtime/handler.go | 209 - .../runtime/marshal_httpbodyproto.go | 43 - .../grpc-gateway/runtime/marshal_json.go | 45 - .../grpc-gateway/runtime/marshal_jsonpb.go | 262 - .../grpc-gateway/runtime/marshal_proto.go | 62 - .../grpc-gateway/runtime/marshaler.go | 48 - .../runtime/marshaler_registry.go | 91 - .../grpc-gateway/runtime/mux.go | 303 - .../grpc-gateway/runtime/pattern.go | 262 - .../grpc-gateway/runtime/proto2_convert.go | 80 - .../grpc-gateway/runtime/proto_errors.go | 106 - .../grpc-gateway/runtime/query.go | 391 - .../grpc-gateway/utilities/BUILD.bazel | 21 - .../grpc-gateway/utilities/doc.go | 2 - .../grpc-gateway/utilities/pattern.go | 22 - .../grpc-gateway/utilities/readerfactory.go | 20 - .../grpc-gateway/utilities/trie.go | 177 - .../hashicorp/go-immutable-radix/CHANGELOG.md | 9 - .../hashicorp/go-immutable-radix/LICENSE | 363 - .../hashicorp/go-immutable-radix/README.md | 66 - .../hashicorp/go-immutable-radix/edges.go | 21 - .../hashicorp/go-immutable-radix/go.mod | 6 - .../hashicorp/go-immutable-radix/go.sum | 4 - .../hashicorp/go-immutable-radix/iradix.go | 662 - .../hashicorp/go-immutable-radix/iter.go | 188 - .../hashicorp/go-immutable-radix/node.go | 304 - .../hashicorp/go-immutable-radix/raw_iter.go | 78 - vendor/github.com/hashicorp/go-memdb/LICENSE | 363 - .../github.com/hashicorp/go-memdb/README.md | 146 - .../github.com/hashicorp/go-memdb/filter.go | 33 - vendor/github.com/hashicorp/go-memdb/go.mod | 5 - vendor/github.com/hashicorp/go-memdb/go.sum | 6 - vendor/github.com/hashicorp/go-memdb/index.go | 848 - vendor/github.com/hashicorp/go-memdb/memdb.go | 97 - .../github.com/hashicorp/go-memdb/schema.go | 114 - vendor/github.com/hashicorp/go-memdb/txn.go | 674 - vendor/github.com/hashicorp/go-memdb/watch.go | 129 - .../hashicorp/go-memdb/watch_few.go | 117 - .../github.com/hashicorp/go-uuid/.travis.yml | 12 + .../hashicorp/go-version/.travis.yml | 13 + .../github.com/hashicorp/go-version/LICENSE | 354 + .../github.com/hashicorp/go-version/README.md | 65 + .../hashicorp/go-version/constraint.go | 204 + vendor/github.com/hashicorp/go-version/go.mod | 1 + .../hashicorp/go-version/version.go | 347 + .../go-version/version_collection.go | 17 + .../hashicorp/golang-lru/.gitignore | 23 + .../haya14busa/go-actions-toolkit/LICENSE | 33 + .../go-actions-toolkit/core/README.md | 9 + .../go-actions-toolkit/core/command.go | 112 + .../go-actions-toolkit/core/core.go | 122 + vendor/github.com/imdario/mergo/.gitignore | 33 + vendor/github.com/imdario/mergo/.travis.yml | 7 + .../insomniacslk/dhcp/CONTRIBUTORS.md | 4 + vendor/github.com/ishidawataru/sctp/LICENSE | 201 - vendor/github.com/ishidawataru/sctp/README.md | 18 - .../ishidawataru/sctp/ipsock_linux.go | 218 - vendor/github.com/ishidawataru/sctp/sctp.go | 696 - .../ishidawataru/sctp/sctp_linux.go | 252 - .../ishidawataru/sctp/sctp_unsupported.go | 75 - .../jmespath/go-jmespath/.gitignore | 4 + .../jmespath/go-jmespath/.travis.yml | 9 + .../github.com/jmespath/go-jmespath/Makefile | 2 +- vendor/github.com/jmespath/go-jmespath/api.go | 37 + .../jmespath/go-jmespath/functions.go | 128 +- .../github.com/jmespath/go-jmespath/parser.go | 4 +- vendor/github.com/jmoiron/sqlx/.gitignore | 24 + vendor/github.com/jmoiron/sqlx/.travis.yml | 27 + .../github.com/json-iterator/go/.codecov.yml | 3 + vendor/github.com/json-iterator/go/.gitignore | 4 + .../github.com/json-iterator/go/.travis.yml | 14 + vendor/github.com/json-iterator/go/build.sh | 0 vendor/github.com/json-iterator/go/test.sh | 0 .../jstemmer/go-junit-report/.gitignore | 1 + .../jstemmer/go-junit-report/.travis.yml | 16 + .../jstemmer/go-junit-report/README.md | 29 +- .../go-junit-report/formatter/formatter.go | 6 +- .../go-junit-report/go-junit-report.go | 27 +- .../jstemmer/go-junit-report/go.mod | 3 + .../jstemmer/go-junit-report/parser/parser.go | 60 +- vendor/github.com/klauspost/compress/LICENSE | 1 + .../klauspost/compress/flate/copy.go | 32 - .../klauspost/compress/flate/crc32_amd64.go | 41 - .../klauspost/compress/flate/crc32_amd64.s | 213 - .../klauspost/compress/flate/crc32_noasm.go | 35 - .../klauspost/compress/flate/deflate.go | 893 +- .../klauspost/compress/flate/fast_encoder.go | 257 + .../klauspost/compress/flate/gen.go | 265 - .../compress/flate/huffman_bit_writer.go | 534 +- .../klauspost/compress/flate/huffman_code.go | 75 +- .../klauspost/compress/flate/inflate.go | 169 +- .../klauspost/compress/flate/level1.go | 174 + .../klauspost/compress/flate/level2.go | 199 + .../klauspost/compress/flate/level3.go | 225 + .../klauspost/compress/flate/level4.go | 210 + .../klauspost/compress/flate/level5.go | 276 + .../klauspost/compress/flate/level6.go | 279 + .../klauspost/compress/flate/reverse_bits.go | 48 - .../klauspost/compress/flate/snappy.go | 900 - .../klauspost/compress/flate/stateless.go | 266 + .../klauspost/compress/flate/token.go | 298 +- .../klauspost/compress/fse/README.md | 79 + .../klauspost/compress/fse/bitreader.go | 107 + .../klauspost/compress/fse/bitwriter.go | 168 + .../klauspost/compress/fse/bytereader.go | 56 + .../klauspost/compress/fse/compress.go | 684 + .../klauspost/compress/fse/decompress.go | 374 + .../github.com/klauspost/compress/fse/fse.go | 143 + .../klauspost/compress/huff0/.gitignore | 1 + .../klauspost/compress/huff0/README.md | 87 + .../klauspost/compress/huff0/bitreader.go | 115 + .../klauspost/compress/huff0/bitwriter.go | 186 + .../klauspost/compress/huff0/bytereader.go | 54 + .../klauspost/compress/huff0/compress.go | 627 + .../klauspost/compress/huff0/decompress.go | 472 + .../klauspost/compress/huff0/huff0.go | 258 + .../klauspost/compress/snappy/.gitignore | 16 + .../klauspost/compress/snappy/AUTHORS | 15 + .../klauspost/compress/snappy/CONTRIBUTORS | 37 + .../klauspost/compress/snappy/LICENSE | 27 + .../klauspost/compress/snappy/README | 107 + .../klauspost/compress/snappy/decode.go | 237 + .../klauspost/compress/snappy/decode_amd64.go | 14 + .../klauspost/compress/snappy/decode_amd64.s | 482 + .../klauspost/compress/snappy/decode_other.go | 115 + .../klauspost/compress/snappy/encode.go | 285 + .../klauspost/compress/snappy/encode_amd64.go | 29 + .../klauspost/compress/snappy/encode_amd64.s | 730 + .../klauspost/compress/snappy/encode_other.go | 238 + .../klauspost/compress/snappy/runbench.cmd | 2 + .../klauspost/compress/snappy/snappy.go | 98 + .../klauspost/compress/zlib/reader.go | 9 +- .../klauspost/compress/zstd/README.md | 385 + .../klauspost/compress/zstd/bitreader.go | 121 + .../klauspost/compress/zstd/bitwriter.go | 169 + .../klauspost/compress/zstd/blockdec.go | 712 + .../klauspost/compress/zstd/blockenc.go | 828 + .../compress/zstd/blocktype_string.go | 85 + .../klauspost/compress/zstd/bytebuf.go | 127 + .../klauspost/compress/zstd/bytereader.go | 74 + .../klauspost/compress/zstd/decoder.go | 484 + .../compress/zstd/decoder_options.go | 68 + .../klauspost/compress/zstd/enc_dfast.go | 413 + .../klauspost/compress/zstd/enc_fast.go | 411 + .../klauspost/compress/zstd/enc_params.go | 154 + .../klauspost/compress/zstd/encoder.go | 504 + .../compress/zstd/encoder_options.go | 220 + .../klauspost/compress/zstd/framedec.go | 489 + .../klauspost/compress/zstd/frameenc.go | 115 + .../klauspost/compress/zstd/fse_decoder.go | 384 + .../klauspost/compress/zstd/fse_encoder.go | 726 + .../klauspost/compress/zstd/fse_predefined.go | 158 + .../klauspost/compress/zstd/hash.go | 77 + .../klauspost/compress/zstd/history.go | 73 + .../compress/zstd/internal/xxhash/LICENSE.txt | 22 + .../compress/zstd/internal/xxhash/README.md | 58 + .../compress/zstd/internal/xxhash/xxhash.go | 238 + .../zstd/internal}/xxhash/xxhash_amd64.go | 0 .../zstd/internal/xxhash/xxhash_amd64.s | 215 + .../zstd/internal/xxhash/xxhash_other.go | 76 + .../zstd/internal/xxhash/xxhash_safe.go | 11 + .../klauspost/compress/zstd/seqdec.go | 402 + .../klauspost/compress/zstd/seqenc.go | 115 + .../klauspost/compress/zstd/snappy.go | 436 + .../klauspost/compress/zstd/zstd.go | 136 + vendor/github.com/klauspost/cpuid/LICENSE | 22 - vendor/github.com/klauspost/cpuid/README.md | 145 - vendor/github.com/klauspost/cpuid/cpuid.go | 1022 - vendor/github.com/klauspost/cpuid/cpuid_386.s | 42 - .../github.com/klauspost/cpuid/cpuid_amd64.s | 42 - .../klauspost/cpuid/detect_intel.go | 17 - .../github.com/klauspost/cpuid/detect_ref.go | 23 - vendor/github.com/klauspost/cpuid/generate.go | 3 - .../github.com/klauspost/cpuid/private-gen.go | 476 - vendor/github.com/klauspost/crc32/LICENSE | 28 - vendor/github.com/klauspost/crc32/README.md | 87 - vendor/github.com/klauspost/crc32/crc32.go | 207 - .../github.com/klauspost/crc32/crc32_amd64.go | 230 - .../github.com/klauspost/crc32/crc32_amd64.s | 319 - .../klauspost/crc32/crc32_amd64p32.go | 43 - .../klauspost/crc32/crc32_amd64p32.s | 67 - .../klauspost/crc32/crc32_generic.go | 89 - .../klauspost/crc32/crc32_otherarch.go | 15 - .../github.com/klauspost/crc32/crc32_s390x.go | 91 - .../github.com/klauspost/crc32/crc32_s390x.s | 249 - vendor/github.com/lib/pq/.gitignore | 4 + vendor/github.com/lib/pq/.travis.sh | 86 + vendor/github.com/lib/pq/.travis.yml | 50 + .../github.com/magefile/mage/.gitattributes | 2 + vendor/github.com/magefile/mage/.gitignore | 27 + .../github.com/magefile/mage/.goreleaser.yml | 53 + vendor/github.com/magefile/mage/.travis.yml | 28 + vendor/github.com/magefile/mage/bootstrap.go | 19 - vendor/github.com/mailru/easyjson/.gitignore | 6 + vendor/github.com/mailru/easyjson/.travis.yml | 12 + .../github.com/mattn/go-colorable/.travis.yml | 9 + vendor/github.com/mattn/go-ieproxy/.gitignore | 1 + vendor/github.com/mattn/go-isatty/.travis.yml | 9 + .../mattn/go-shellwords/.travis.yml | 13 + vendor/github.com/mattn/go-shellwords/LICENSE | 21 + .../github.com/mattn/go-shellwords/README.md | 48 + vendor/github.com/mattn/go-shellwords/go.mod | 1 + .../github.com/mattn/go-shellwords/go.test.sh | 12 + .../mattn/go-shellwords/shellwords.go | 199 + .../mattn/go-shellwords/util_go15.go | 29 + .../mattn/go-shellwords/util_posix.go | 26 + .../mattn/go-shellwords/util_windows.go | 26 + .../pbutil/.gitignore | 1 + vendor/github.com/miekg/dns/.codecov.yml | 8 + vendor/github.com/miekg/dns/.gitignore | 4 + vendor/github.com/miekg/dns/.travis.yml | 19 + .../miekg/dns/duplicate_generate.go | 144 - vendor/github.com/miekg/dns/msg_generate.go | 328 - vendor/github.com/miekg/dns/types_generate.go | 285 - .../github.com/mitchellh/gox/.gitattributes | 1 + vendor/github.com/mitchellh/gox/.gitignore | 1 + vendor/github.com/mitchellh/gox/.travis.yml | 15 + vendor/github.com/mitchellh/gox/Gopkg.lock | 15 + vendor/github.com/mitchellh/gox/Gopkg.toml | 26 + vendor/github.com/mitchellh/gox/LICENSE | 374 + vendor/github.com/mitchellh/gox/README.md | 95 + vendor/github.com/mitchellh/gox/appveyor.yml | 19 + .../github.com/mitchellh/gox/env_override.go | 17 + vendor/github.com/mitchellh/gox/go.go | 233 + vendor/github.com/mitchellh/gox/go.mod | 6 + vendor/github.com/mitchellh/gox/go.sum | 6 + vendor/github.com/mitchellh/gox/main.go | 262 + .../github.com/mitchellh/gox/main_osarch.go | 19 + vendor/github.com/mitchellh/gox/platform.go | 149 + .../github.com/mitchellh/gox/platform_flag.go | 272 + vendor/github.com/mitchellh/gox/toolchain.go | 148 + vendor/github.com/mitchellh/iochan/LICENSE.md | 21 + vendor/github.com/mitchellh/iochan/README.md | 13 + vendor/github.com/mitchellh/iochan/go.mod | 1 + vendor/github.com/mitchellh/iochan/iochan.go | 41 + .../mitchellh/mapstructure/.travis.yml | 8 + .../modern-go/concurrent/.gitignore | 1 + .../modern-go/concurrent/.travis.yml | 14 + .../github.com/modern-go/concurrent/test.sh | 0 .../github.com/modern-go/reflect2/.gitignore | 2 + .../github.com/modern-go/reflect2/.travis.yml | 15 + vendor/github.com/modern-go/reflect2/test.sh | 0 .../opencontainers/go-digest/.mailmap | 1 + .../opencontainers/go-digest/.pullapprove.yml | 12 + .../opencontainers/go-digest/.travis.yml | 8 + vendor/github.com/pierrec/lz4/.gitignore | 34 + vendor/github.com/pierrec/lz4/.travis.yml | 24 + vendor/github.com/pierrec/lz4/README.md | 116 +- vendor/github.com/pierrec/lz4/block.go | 506 +- vendor/github.com/pierrec/lz4/debug.go | 23 + vendor/github.com/pierrec/lz4/debug_stub.go | 7 + vendor/github.com/pierrec/lz4/decode_amd64.go | 8 + vendor/github.com/pierrec/lz4/decode_amd64.s | 375 + vendor/github.com/pierrec/lz4/decode_other.go | 92 + vendor/github.com/pierrec/lz4/errors.go | 28 + .../pierrec/lz4/internal/xxh32/xxh32zero.go | 223 + vendor/github.com/pierrec/lz4/lz4.go | 105 +- vendor/github.com/pierrec/lz4/lz4_go1.10.go | 29 + .../github.com/pierrec/lz4/lz4_notgo1.10.go | 29 + vendor/github.com/pierrec/lz4/reader.go | 445 +- vendor/github.com/pierrec/lz4/writer.go | 391 +- vendor/github.com/pierrec/xxHash/LICENSE | 28 - .../pierrec/xxHash/xxHash32/xxHash32.go | 205 - .../github.com/pierrre/gotestcover/.gitignore | 2 + .../pierrre/gotestcover/.travis.yml | 23 + vendor/github.com/pkg/errors/.gitignore | 24 + vendor/github.com/pkg/errors/.travis.yml | 10 + vendor/github.com/pkg/errors/Makefile | 44 + vendor/github.com/pkg/errors/README.md | 15 +- vendor/github.com/pkg/errors/appveyor.yml | 32 + vendor/github.com/pkg/errors/errors.go | 51 +- vendor/github.com/pkg/errors/go113.go | 38 + vendor/github.com/pkg/errors/stack.go | 109 +- .../client_golang/prometheus/.gitignore | 1 + .../prometheus/common/expfmt/text_create.go | 18 +- .../prometheus/common/expfmt/text_parse.go | 13 +- .../github.com/prometheus/procfs/.gitignore | 1 + .../prometheus/procfs/.golangci.yml | 4 + .../github.com/prometheus/procfs/nfs/nfs.go | 319 - .../github.com/prometheus/procfs/nfs/parse.go | 317 - .../prometheus/procfs/nfs/parse_nfs.go | 67 - .../prometheus/procfs/nfs/parse_nfsd.go | 89 - vendor/github.com/prometheus/procfs/ttar | 0 .../github.com/prometheus/procfs/xfs/parse.go | 508 - .../github.com/prometheus/procfs/xfs/xfs.go | 371 - .../github.com/rcrowley/go-metrics/.gitignore | 9 + .../rcrowley/go-metrics/.travis.yml | 17 + .../github.com/rcrowley/go-metrics/exp/exp.go | 156 - .../rcrowley/go-metrics/validate.sh | 0 .../reviewdog/errorformat/.codecov.yml | 10 + .../reviewdog/errorformat/.gitignore | 1 + .../reviewdog/errorformat/.travis.yml | 25 + .../github.com/reviewdog/errorformat/LICENSE | 21 + .../reviewdog/errorformat/README.md | 171 + .../reviewdog/errorformat/errorformat.go | 574 + .../reviewdog/errorformat/fmts/README.md | 99 + .../reviewdog/errorformat/fmts/ansible.go | 15 + .../reviewdog/errorformat/fmts/css.go | 17 + .../reviewdog/errorformat/fmts/doc.go | 44 + .../reviewdog/errorformat/fmts/env.go | 15 + .../reviewdog/errorformat/fmts/fmt.go | 61 + .../reviewdog/errorformat/fmts/go.go | 38 + .../reviewdog/errorformat/fmts/javascript.go | 32 + .../reviewdog/errorformat/fmts/php.go | 15 + .../reviewdog/errorformat/fmts/puppet.go | 15 + .../reviewdog/errorformat/fmts/python.go | 15 + .../reviewdog/errorformat/fmts/ruby.go | 39 + .../reviewdog/errorformat/fmts/rust.go | 25 + .../reviewdog/errorformat/fmts/scala.go | 66 + .../reviewdog/errorformat/fmts/typescript.go | 30 + .../github.com/reviewdog/errorformat/go.mod | 5 + .../github.com/reviewdog/errorformat/go.sum | 2 + .../reviewdog/errorformat/reviewdog.yml | 8 + .../reviewdog/reviewdog/.codecov.yml | 10 + .../github.com/reviewdog/reviewdog/.gitignore | 4 + .../reviewdog/reviewdog/.gitlab-ci.yml | 37 + .../reviewdog/reviewdog/.goreleaser.yml | 54 + .../reviewdog/reviewdog/.reviewdog.yml | 38 + .../reviewdog/reviewdog/.revive.toml | 15 + .../reviewdog/reviewdog/.textlintrc | 7 + .../reviewdog/reviewdog/.travis.yml | 55 + vendor/github.com/reviewdog/reviewdog/LICENSE | 21 + .../github.com/reviewdog/reviewdog/README.md | 652 + .../reviewdog/reviewdog/cienv/cienv.go | 137 + .../reviewdog/cienv/github_actions.go | 96 + .../reviewdog/cmd/reviewdog/.gitignore | 1 + .../reviewdog/cmd/reviewdog/doghouse.go | 239 + .../reviewdog/reviewdog/cmd/reviewdog/main.go | 609 + .../reviewdog/reviewdog/commands/version.go | 7 + .../github.com/reviewdog/reviewdog/comment.go | 37 + .../reviewdog/reviewdog/comment_iowriter.go | 56 + vendor/github.com/reviewdog/reviewdog/diff.go | 62 + .../reviewdog/reviewdog/diff/diff.go | 97 + .../reviewdog/reviewdog/diff/parse.go | 379 + .../reviewdog/doghouse/client/client.go | 85 + .../doghouse/client/github_client.go | 20 + .../reviewdog/doghouse/server/doghouse.go | 262 + .../reviewdog/doghouse/server/github.go | 73 + .../doghouse/server/github_checker.go | 33 + .../doghouse/server/storage/datastore.go | 18 + .../doghouse/server/storage/installation.go | 78 + .../doghouse/server/storage/token.go | 65 + .../reviewdog/doghouse/server/token.go | 47 + .../reviewdog/reviewdog/doghouse/service.go | 76 + .../github.com/reviewdog/reviewdog/filter.go | 129 + vendor/github.com/reviewdog/reviewdog/go.mod | 23 + vendor/github.com/reviewdog/reviewdog/go.sum | 268 + .../github.com/reviewdog/reviewdog/install.sh | 395 + .../reviewdog/reviewdog/package-lock.json | 1853 ++ .../reviewdog/reviewdog/package.json | 9 + .../github.com/reviewdog/reviewdog/parser.go | 143 + .../reviewdog/reviewdog/project/cmdbuilder.go | 51 + .../reviewdog/reviewdog/project/conf.go | 39 + .../reviewdog/reviewdog/project/run.go | 140 + .../reviewdog/reviewdog/resultmap.go | 103 + .../reviewdog/reviewdog/reviewdog.go | 123 + .../reviewdog/service/github/github.go | 214 + .../github/githubutils/comment_writer.go | 88 + .../service/github/githubutils/utils.go | 43 + .../service/gitlab/gitlab_mr_commit.go | 148 + .../service/gitlab/gitlab_mr_diff.go | 78 + .../service/gitlab/gitlab_mr_discussion.go | 144 + .../service/serviceutil/serviceutil.go | 63 + vendor/github.com/samuel/go-parser/LICENSE | 25 - vendor/github.com/samuel/go-parser/README.md | 11 - vendor/github.com/sanathkr/go-yaml/.gitignore | 1 + .../github.com/sanathkr/go-yaml/.travis.yml | 9 + vendor/github.com/sanathkr/yaml/.gitignore | 20 + vendor/github.com/sanathkr/yaml/.travis.yml | 7 + .../.github/ISSUE_TEMPLATE/bug_report.md | 26 - .../.github/ISSUE_TEMPLATE/feature_request.md | 17 - vendor/github.com/shirou/gopsutil/Gopkg.lock | 85 - vendor/github.com/shirou/gopsutil/Gopkg.toml | 46 - vendor/github.com/shirou/gopsutil/Makefile | 37 - vendor/github.com/shirou/gopsutil/README.rst | 323 - vendor/github.com/shirou/gopsutil/coverall.sh | 26 - vendor/github.com/shirou/gopsutil/cpu/cpu.go | 184 - .../shirou/gopsutil/cpu/cpu_darwin.go | 103 - .../shirou/gopsutil/cpu/cpu_darwin_cgo.go | 111 - .../shirou/gopsutil/cpu/cpu_darwin_nocgo.go | 14 - .../shirou/gopsutil/cpu/cpu_fallback.go | 30 - .../shirou/gopsutil/cpu/cpu_freebsd.go | 173 - .../shirou/gopsutil/cpu/cpu_freebsd_386.go | 9 - .../shirou/gopsutil/cpu/cpu_freebsd_amd64.go | 9 - .../shirou/gopsutil/cpu/cpu_freebsd_arm.go | 9 - .../shirou/gopsutil/cpu/cpu_linux.go | 352 - .../shirou/gopsutil/cpu/cpu_openbsd.go | 195 - .../shirou/gopsutil/cpu/cpu_solaris.go | 286 - .../shirou/gopsutil/cpu/cpu_windows.go | 255 - .../gopsutil/cpu/testdata/linux/424/proc/stat | 12 - .../cpu/testdata/linux/times_empty/proc/stat | 0 vendor/github.com/shirou/gopsutil/doc.go | 1 - .../shirou/gopsutil/docker/docker.go | 74 - .../shirou/gopsutil/docker/docker_linux.go | 298 - .../shirou/gopsutil/docker/docker_notlinux.go | 66 - .../gopsutil/host/freebsd_headers/utxdb.h | 63 - .../github.com/shirou/gopsutil/host/host.go | 54 - .../shirou/gopsutil/host/host_darwin.go | 233 - .../shirou/gopsutil/host/host_darwin_386.go | 19 - .../shirou/gopsutil/host/host_darwin_amd64.go | 19 - .../shirou/gopsutil/host/host_fallback.go | 65 - .../shirou/gopsutil/host/host_freebsd.go | 251 - .../shirou/gopsutil/host/host_freebsd_386.go | 37 - .../gopsutil/host/host_freebsd_amd64.go | 37 - .../shirou/gopsutil/host/host_freebsd_arm.go | 37 - .../shirou/gopsutil/host/host_linux.go | 510 - .../shirou/gopsutil/host/host_linux_386.go | 45 - .../shirou/gopsutil/host/host_linux_amd64.go | 48 - .../shirou/gopsutil/host/host_linux_arm.go | 43 - .../shirou/gopsutil/host/host_linux_arm64.go | 43 - .../shirou/gopsutil/host/host_linux_mips.go | 43 - .../shirou/gopsutil/host/host_linux_mips64.go | 43 - .../gopsutil/host/host_linux_mips64le.go | 43 - .../shirou/gopsutil/host/host_linux_mipsle.go | 43 - .../gopsutil/host/host_linux_ppc64le.go | 45 - .../shirou/gopsutil/host/host_linux_s390x.go | 45 - .../shirou/gopsutil/host/host_openbsd.go | 203 - .../gopsutil/host/host_openbsd_amd64.go | 31 - .../shirou/gopsutil/host/host_posix.go | 15 - .../shirou/gopsutil/host/host_solaris.go | 253 - .../shirou/gopsutil/host/host_windows.go | 349 - .../github.com/shirou/gopsutil/host/types.go | 25 - .../github.com/shirou/gopsutil/load/load.go | 32 - .../shirou/gopsutil/load/load_bsd.go | 68 - .../shirou/gopsutil/load/load_darwin.go | 71 - .../shirou/gopsutil/load/load_fallback.go | 25 - .../shirou/gopsutil/load/load_linux.go | 109 - .../shirou/gopsutil/load/load_windows.go | 29 - vendor/github.com/shirou/gopsutil/mem/mem.go | 101 - .../shirou/gopsutil/mem/mem_darwin.go | 69 - .../shirou/gopsutil/mem/mem_darwin_cgo.go | 59 - .../shirou/gopsutil/mem/mem_darwin_nocgo.go | 94 - .../shirou/gopsutil/mem/mem_fallback.go | 25 - .../shirou/gopsutil/mem/mem_freebsd.go | 167 - .../shirou/gopsutil/mem/mem_linux.go | 247 - .../shirou/gopsutil/mem/mem_openbsd.go | 124 - .../shirou/gopsutil/mem/mem_openbsd_amd64.go | 122 - .../shirou/gopsutil/mem/mem_solaris.go | 121 - .../shirou/gopsutil/mem/mem_windows.go | 97 - vendor/github.com/shirou/gopsutil/mktypes.sh | 37 - .../shirou/gopsutil/process/process.go | 314 - .../shirou/gopsutil/process/process_darwin.go | 640 - .../gopsutil/process/process_darwin_386.go | 234 - .../gopsutil/process/process_darwin_amd64.go | 234 - .../gopsutil/process/process_darwin_cgo.go | 30 - .../gopsutil/process/process_darwin_nocgo.go | 34 - .../gopsutil/process/process_fallback.go | 332 - .../gopsutil/process/process_freebsd.go | 498 - .../gopsutil/process/process_freebsd_386.go | 192 - .../gopsutil/process/process_freebsd_amd64.go | 192 - .../gopsutil/process/process_freebsd_arm.go | 192 - .../shirou/gopsutil/process/process_linux.go | 1272 - .../gopsutil/process/process_openbsd.go | 524 - .../gopsutil/process/process_openbsd_amd64.go | 200 - .../shirou/gopsutil/process/process_posix.go | 175 - .../gopsutil/process/process_windows.go | 848 - .../gopsutil/process/process_windows_386.go | 16 - .../gopsutil/process/process_windows_amd64.go | 16 - .../process/testdata/darwin/ps-ax-opid_fail | 10 - .../github.com/shirou/gopsutil/v2migration.sh | 134 - .../shirou/gopsutil/windows_memo.rst | 36 - .../shirou/gopsutil/winservices/manager.go | 32 - .../gopsutil/winservices/winservices.go | 126 - vendor/github.com/shirou/w32/AUTHORS | 16 - vendor/github.com/shirou/w32/LICENSE | 23 - vendor/github.com/shirou/w32/README.md | 33 - vendor/github.com/shirou/w32/advapi32.go | 301 - vendor/github.com/shirou/w32/comctl32.go | 111 - vendor/github.com/shirou/w32/comdlg32.go | 40 - vendor/github.com/shirou/w32/constants.go | 2661 -- vendor/github.com/shirou/w32/dwmapi.go | 256 - vendor/github.com/shirou/w32/gdi32.go | 511 - vendor/github.com/shirou/w32/gdiplus.go | 177 - vendor/github.com/shirou/w32/idispatch.go | 45 - vendor/github.com/shirou/w32/istream.go | 33 - vendor/github.com/shirou/w32/iunknown.go | 29 - vendor/github.com/shirou/w32/kernel32.go | 316 - vendor/github.com/shirou/w32/ole32.go | 65 - vendor/github.com/shirou/w32/oleaut32.go | 50 - vendor/github.com/shirou/w32/opengl32.go | 74 - vendor/github.com/shirou/w32/psapi.go | 27 - vendor/github.com/shirou/w32/shell32.go | 155 - vendor/github.com/shirou/w32/typedef.go | 901 - vendor/github.com/shirou/w32/user32.go | 950 - vendor/github.com/shirou/w32/utils.go | 203 - vendor/github.com/shirou/w32/vars.go | 13 - vendor/github.com/sirupsen/logrus/.gitignore | 2 + vendor/github.com/sirupsen/logrus/.travis.yml | 25 + .../github.com/sirupsen/logrus/CHANGELOG.md | 10 + .../github.com/sirupsen/logrus/appveyor.yml | 14 + vendor/github.com/sirupsen/logrus/go.mod | 2 +- vendor/github.com/sirupsen/logrus/go.sum | 3 + .../{terminal => }/terminal_check_bsd.go | 5 +- .../sirupsen/logrus/terminal_check_js.go | 11 - .../logrus/terminal_check_no_terminal.go | 11 + .../logrus/terminal_check_notappengine.go | 6 +- .../sirupsen/logrus/terminal_check_solaris.go | 11 + .../{terminal => }/terminal_check_unix.go | 5 +- .../sirupsen/logrus/terminal_check_windows.go | 18 +- .../sirupsen/logrus/terminal_notwindows.go | 8 - .../sirupsen/logrus/terminal_windows.go | 18 - .../sirupsen/logrus/text_formatter.go | 27 +- vendor/github.com/spf13/cobra/.gitignore | 36 + vendor/github.com/spf13/cobra/.mailmap | 3 + vendor/github.com/spf13/cobra/.travis.yml | 21 + vendor/github.com/spf13/cobra/README.md | 28 +- .../spf13/cobra/bash_completions.go | 167 +- .../spf13/cobra/bash_completions.md | 31 +- vendor/github.com/spf13/cobra/cobra.go | 3 +- vendor/github.com/spf13/cobra/command.go | 109 +- vendor/github.com/spf13/pflag/.gitignore | 2 + vendor/github.com/spf13/pflag/.travis.yml | 21 + vendor/github.com/spf13/pflag/bytes.go | 209 + vendor/github.com/spf13/pflag/count.go | 12 +- .../github.com/spf13/pflag/duration_slice.go | 128 + vendor/github.com/spf13/pflag/flag.go | 161 +- vendor/github.com/spf13/pflag/golangflag.go | 4 + vendor/github.com/spf13/pflag/int16.go | 88 + vendor/github.com/spf13/pflag/string_array.go | 8 +- vendor/github.com/spf13/pflag/string_slice.go | 20 + .../github.com/spf13/pflag/string_to_int.go | 149 + .../spf13/pflag/string_to_string.go | 160 + .../github.com/stretchr/objx/.codeclimate.yml | 21 + vendor/github.com/stretchr/objx/.gitignore | 11 + vendor/github.com/stretchr/objx/.travis.yml | 33 + vendor/github.com/stretchr/objx/Taskfile.yml | 30 + vendor/github.com/stretchr/testify/LICENSE | 35 +- .../testify/assert/assertion_format.go | 82 + .../testify/assert/assertion_forward.go | 164 + .../testify/assert/assertion_order.go | 309 + .../stretchr/testify/assert/assertions.go | 128 +- .../github.com/stretchr/testify/mock/mock.go | 23 +- .../stretchr/testify/require/require.go | 750 +- .../stretchr/testify/require/require.go.tmpl | 2 +- .../testify/require/require_forward.go | 164 + .../stretchr/testify/require/requirements.go | 2 +- vendor/github.com/tsg/go-daemon/.gitignore | 2 + vendor/github.com/tsg/go-daemon/daemon.go | 1 + vendor/github.com/tsg/go-daemon/go.mod | 3 + .../github.com/tsg/go-daemon/{ => src}/god.c | 0 vendor/github.com/tsg/gopacket/.gitignore | 32 + .../github.com/tsg/gopacket/.travis.gofmt.sh | 7 + .../github.com/tsg/gopacket/.travis.govet.sh | 10 + vendor/github.com/tsg/gopacket/.travis.yml | 11 + vendor/github.com/tsg/gopacket/gc | 0 vendor/github.com/tsg/gopacket/layers/gen.go | 109 - .../tsg/gopacket/layers/test_creator.py | 4 +- vendor/github.com/tsg/gopacket/pfring/doc.go | 58 - .../github.com/tsg/gopacket/pfring/pfring.go | 304 - vendor/github.com/urso/go-bin/.gitignore | 14 + vendor/github.com/urso/go-bin/bin.yml | 53 + vendor/github.com/urso/go-bin/bin_test.yml | 53 + vendor/github.com/urso/go-bin/types.yml | 6 + vendor/github.com/urso/qcgen/LICENSE | 201 - vendor/github.com/urso/qcgen/README.md | 2 - vendor/github.com/urso/qcgen/helpers.go | 32 - vendor/github.com/urso/qcgen/qcgen.go | 80 - vendor/github.com/vmware/govmomi/.drone.sec | 1 + vendor/github.com/vmware/govmomi/.drone.yml | 17 + vendor/github.com/vmware/govmomi/.gitignore | 1 + vendor/github.com/vmware/govmomi/.mailmap | 17 + vendor/github.com/vmware/govmomi/.travis.yml | 12 + vendor/github.com/vmware/govmomi/ovf/cim.go | 78 - vendor/github.com/vmware/govmomi/ovf/doc.go | 25 - vendor/github.com/vmware/govmomi/ovf/env.go | 98 - .../github.com/vmware/govmomi/ovf/envelope.go | 191 - .../github.com/vmware/govmomi/ovf/manager.go | 103 - vendor/github.com/vmware/govmomi/ovf/ovf.go | 34 - .../weppos/publicsuffix-go/LICENSE.txt | 21 - .../publicsuffix/publicsuffix.go | 541 - .../publicsuffix-go/publicsuffix/rules.go | 8806 ------- vendor/github.com/xanzy/go-gitlab/.gitignore | 28 + vendor/github.com/xanzy/go-gitlab/.travis.yml | 28 + .../github.com/xanzy/go-gitlab/CHANGELOG.md | 27 + .../libnetwork => xanzy/go-gitlab}/LICENSE | 0 vendor/github.com/xanzy/go-gitlab/README.md | 173 + .../xanzy/go-gitlab/access_requests.go | 236 + .../xanzy/go-gitlab/award_emojis.go | 467 + vendor/github.com/xanzy/go-gitlab/boards.go | 344 + vendor/github.com/xanzy/go-gitlab/branches.go | 242 + .../xanzy/go-gitlab/broadcast_messages.go | 172 + .../xanzy/go-gitlab/ci_yml_templates.go | 69 + vendor/github.com/xanzy/go-gitlab/commits.go | 593 + .../xanzy/go-gitlab/custom_attributes.go | 171 + .../github.com/xanzy/go-gitlab/deploy_keys.go | 200 + .../github.com/xanzy/go-gitlab/deployments.go | 120 + .../github.com/xanzy/go-gitlab/discussions.go | 1112 + .../xanzy/go-gitlab/environments.go | 212 + vendor/github.com/xanzy/go-gitlab/epics.go | 211 + .../xanzy/go-gitlab/event_parsing.go | 117 + .../github.com/xanzy/go-gitlab/event_types.go | 827 + vendor/github.com/xanzy/go-gitlab/events.go | 146 + .../xanzy/go-gitlab/feature_flags.go | 79 + .../xanzy/go-gitlab/gitignore_templates.go | 84 + vendor/github.com/xanzy/go-gitlab/gitlab.go | 955 + vendor/github.com/xanzy/go-gitlab/go.mod | 12 + vendor/github.com/xanzy/go-gitlab/go.sum | 25 + .../xanzy/go-gitlab/group_badges.go | 213 + .../xanzy/go-gitlab/group_boards.go | 261 + .../xanzy/go-gitlab/group_clusters.go | 211 + .../xanzy/go-gitlab/group_labels.go | 196 + .../xanzy/go-gitlab/group_members.go | 219 + .../xanzy/go-gitlab/group_milestones.go | 249 + .../xanzy/go-gitlab/group_variables.go | 196 + vendor/github.com/xanzy/go-gitlab/groups.go | 335 + .../github.com/xanzy/go-gitlab/issue_links.go | 127 + vendor/github.com/xanzy/go-gitlab/issues.go | 568 + vendor/github.com/xanzy/go-gitlab/jobs.go | 408 + vendor/github.com/xanzy/go-gitlab/keys.go | 65 + vendor/github.com/xanzy/go-gitlab/labels.go | 250 + vendor/github.com/xanzy/go-gitlab/license.go | 94 + .../xanzy/go-gitlab/license_templates.go | 92 + .../go-gitlab/merge_request_approvals.go | 331 + .../xanzy/go-gitlab/merge_requests.go | 836 + .../github.com/xanzy/go-gitlab/milestones.go | 267 + .../github.com/xanzy/go-gitlab/namespaces.go | 122 + vendor/github.com/xanzy/go-gitlab/notes.go | 678 + .../xanzy/go-gitlab/notifications.go | 213 + .../xanzy/go-gitlab/pages_domains.go | 193 + .../xanzy/go-gitlab/pipeline_schedules.go | 327 + .../xanzy/go-gitlab/pipeline_triggers.go | 231 + .../github.com/xanzy/go-gitlab/pipelines.go | 286 + .../xanzy/go-gitlab/project_badges.go | 207 + .../xanzy/go-gitlab/project_clusters.go | 221 + .../xanzy/go-gitlab/project_import_export.go | 196 + .../xanzy/go-gitlab/project_members.go | 209 + .../xanzy/go-gitlab/project_snippets.go | 206 + .../xanzy/go-gitlab/project_variables.go | 201 + vendor/github.com/xanzy/go-gitlab/projects.go | 1551 ++ .../xanzy/go-gitlab/protected_branches.go | 165 + .../xanzy/go-gitlab/protected_tags.go | 145 + vendor/github.com/xanzy/go-gitlab/registry.go | 219 + .../xanzy/go-gitlab/releaselinks.go | 176 + vendor/github.com/xanzy/go-gitlab/releases.go | 212 + .../xanzy/go-gitlab/repositories.go | 331 + .../xanzy/go-gitlab/repository_files.go | 311 + .../xanzy/go-gitlab/resource_label_events.go | 219 + vendor/github.com/xanzy/go-gitlab/runners.go | 416 + vendor/github.com/xanzy/go-gitlab/search.go | 354 + vendor/github.com/xanzy/go-gitlab/services.go | 866 + vendor/github.com/xanzy/go-gitlab/settings.go | 409 + .../xanzy/go-gitlab/sidekiq_metrics.go | 154 + vendor/github.com/xanzy/go-gitlab/snippets.go | 230 + vendor/github.com/xanzy/go-gitlab/strings.go | 94 + .../xanzy/go-gitlab/system_hooks.go | 143 + vendor/github.com/xanzy/go-gitlab/tags.go | 243 + .../github.com/xanzy/go-gitlab/time_stats.go | 162 + vendor/github.com/xanzy/go-gitlab/todos.go | 176 + vendor/github.com/xanzy/go-gitlab/users.go | 929 + vendor/github.com/xanzy/go-gitlab/validate.go | 40 + vendor/github.com/xanzy/go-gitlab/version.go | 56 + vendor/github.com/xanzy/go-gitlab/wikis.go | 204 + vendor/github.com/xdg/scram/LICENSE | 175 - vendor/github.com/xdg/scram/README.md | 71 - vendor/github.com/xdg/scram/client.go | 130 - vendor/github.com/xdg/scram/client_conv.go | 149 - vendor/github.com/xdg/scram/common.go | 97 - vendor/github.com/xdg/scram/doc.go | 24 - vendor/github.com/xdg/scram/parse.go | 205 - vendor/github.com/xdg/scram/scram.go | 66 - vendor/github.com/xdg/scram/server.go | 50 - vendor/github.com/xdg/scram/server_conv.go | 151 - vendor/github.com/xdg/stringprep/LICENSE | 175 - vendor/github.com/xdg/stringprep/README.md | 27 - vendor/github.com/xdg/stringprep/bidi.go | 73 - vendor/github.com/xdg/stringprep/doc.go | 10 - vendor/github.com/xdg/stringprep/error.go | 14 - vendor/github.com/xdg/stringprep/map.go | 21 - vendor/github.com/xdg/stringprep/profile.go | 75 - vendor/github.com/xdg/stringprep/saslprep.go | 52 - vendor/github.com/xdg/stringprep/set.go | 36 - vendor/github.com/xdg/stringprep/tables.go | 3215 --- vendor/github.com/yuin/gopher-lua/.travis.yml | 15 + .../github.com/yuin/gopher-lua/parse/Makefile | 4 + .../yuin/gopher-lua/parse/parser.go.y | 524 + vendor/github.com/zmap/zlint/LICENSE | 202 - vendor/github.com/zmap/zlint/README.md | 189 - vendor/github.com/zmap/zlint/go.mod | 10 - vendor/github.com/zmap/zlint/go.sum | 43 - vendor/github.com/zmap/zlint/lints/base.go | 127 - .../lint_basic_constraints_not_critical.go | 66 - .../lints/lint_ca_common_name_missing.go | 49 - .../lints/lint_ca_country_name_invalid.go | 62 - .../lints/lint_ca_country_name_missing.go | 57 - .../zlint/lints/lint_ca_crl_sign_not_set.go | 56 - .../lint_ca_digital_signature_not_set.go | 55 - .../zmap/zlint/lints/lint_ca_is_ca.go | 62 - .../lints/lint_ca_key_cert_sign_not_set.go | 55 - .../zlint/lints/lint_ca_key_usage_missing.go | 57 - .../lints/lint_ca_key_usage_not_critical.go | 55 - .../lint_ca_organization_name_missing.go | 54 - .../lints/lint_ca_subject_field_empty.go | 61 - .../lint_cab_dv_conflicts_with_locality.go | 51 - .../lints/lint_cab_dv_conflicts_with_org.go | 54 - .../lint_cab_dv_conflicts_with_postal.go | 54 - .../lint_cab_dv_conflicts_with_province.go | 54 - .../lint_cab_dv_conflicts_with_street.go | 54 - .../lint_cab_iv_requires_personal_name.go | 53 - .../zlint/lints/lint_cab_ov_requires_org.go | 53 - .../lint_cert_contains_unique_identifier.go | 61 - .../lint_cert_extensions_version_not_3.go | 67 - .../lint_cert_policy_iv_requires_country.go | 53 - ...policy_iv_requires_province_or_locality.go | 54 - .../lint_cert_policy_ov_requires_country.go | 53 - ...policy_ov_requires_province_or_locality.go | 54 - ...rt_unique_identifier_version_not_2_or_3.go | 63 - .../lint_ct_sct_policy_count_unsatisfied.go | 156 - .../zlint/lints/lint_dh_params_missing.go | 55 - .../lint_distribution_point_incomplete.go | 84 - ..._distribution_point_missing_ldap_or_uri.go | 57 - .../lint_dnsname_bad_character_in_label.go | 63 - .../lint_dnsname_check_left_label_wildcard.go | 66 - .../lint_dnsname_contains_bare_iana_suffix.go | 55 - .../lint_dnsname_contains_empty_label.go | 67 - .../zlint/lints/lint_dnsname_hyphen_in_sld.go | 66 - .../lints/lint_dnsname_label_too_long.go | 69 - .../lint_dnsname_right_label_valid_tld.go | 55 - .../lints/lint_dnsname_underscore_in_sld.go | 66 - .../lints/lint_dnsname_underscore_in_trd.go | 67 - ..._dnsname_wildcard_left_of_public_suffix.go | 66 - ...int_dnsname_wildcard_only_in_left_label.go | 68 - .../lint_dsa_correct_order_in_subgroup.go | 65 - ...nt_dsa_improper_modulus_or_divisor_size.go | 56 - .../lints/lint_dsa_shorter_than_2048_bits.go | 58 - .../lint_dsa_unique_correct_representation.go | 59 - .../zlint/lints/lint_ec_improper_curves.go | 71 - .../zlint/lints/lint_ecdsa_ee_invalid_ku.go | 98 - .../lints/lint_eku_critical_improperly.go | 66 - .../lint_ev_business_category_missing.go | 49 - .../lints/lint_ev_country_name_missing.go | 49 - .../lint_ev_organization_name_missing.go | 49 - .../lints/lint_ev_serial_number_missing.go | 48 - .../lints/lint_ev_valid_time_too_long.go | 48 - .../lint_ext_aia_access_location_missing.go | 63 - .../lints/lint_ext_aia_marked_critical.go | 55 - ...t_ext_authority_key_identifier_critical.go | 55 - ...nt_ext_authority_key_identifier_missing.go | 64 - ...hority_key_identifier_no_key_identifier.go | 64 - ...lint_ext_cert_policy_contains_noticeref.go | 66 - ..._policy_disallowed_any_policy_qualifier.go | 63 - .../lints/lint_ext_cert_policy_duplicate.go | 62 - ...xt_cert_policy_explicit_text_ia5_string.go | 71 - ...t_policy_explicit_text_includes_control.go | 89 - ...t_ext_cert_policy_explicit_text_not_nfc.go | 65 - ..._ext_cert_policy_explicit_text_not_utf8.go | 70 - ..._ext_cert_policy_explicit_text_too_long.go | 81 - ...nt_ext_crl_distribution_marked_critical.go | 56 - .../lints/lint_ext_duplicate_extension.go | 58 - .../lint_ext_freshest_crl_marked_critical.go | 56 - .../zmap/zlint/lints/lint_ext_ian_critical.go | 55 - .../lints/lint_ext_ian_dns_not_ia5_string.go | 73 - .../zlint/lints/lint_ext_ian_empty_name.go | 80 - .../zlint/lints/lint_ext_ian_no_entries.go | 62 - .../lint_ext_ian_rfc822_format_invalid.go | 69 - .../lints/lint_ext_ian_space_dns_name.go | 66 - .../lints/lint_ext_ian_uri_format_invalid.go | 69 - .../lint_ext_ian_uri_host_not_fqdn_or_ip.go | 71 - .../zlint/lints/lint_ext_ian_uri_not_ia5.go | 59 - .../zlint/lints/lint_ext_ian_uri_relative.go | 70 - ...lint_ext_key_usage_cert_sign_without_ca.go | 64 - .../lints/lint_ext_key_usage_not_critical.go | 56 - .../lints/lint_ext_key_usage_without_bits.go | 58 - .../lint_ext_name_constraints_not_critical.go | 62 - .../lint_ext_name_constraints_not_in_ca.go | 60 - .../lint_ext_policy_constraints_empty.go | 75 - ...int_ext_policy_constraints_not_critical.go | 55 - .../lints/lint_ext_policy_map_any_policy.go | 64 - .../lints/lint_ext_policy_map_not_critical.go | 56 - .../lint_ext_policy_map_not_in_cert_policy.go | 63 - .../lint_ext_san_contains_reserved_ip.go | 60 - .../lint_ext_san_critical_with_subject_dn.go | 60 - .../lint_ext_san_directory_name_present.go | 59 - .../lints/lint_ext_san_dns_name_too_long.go | 50 - .../lints/lint_ext_san_dns_not_ia5_string.go | 72 - .../lint_ext_san_edi_party_name_present.go | 59 - .../zlint/lints/lint_ext_san_empty_name.go | 80 - .../zmap/zlint/lints/lint_ext_san_missing.go | 56 - .../zlint/lints/lint_ext_san_no_entries.go | 62 - ...nt_ext_san_not_critical_without_subject.go | 62 - .../lints/lint_ext_san_other_name_present.go | 59 - .../lint_ext_san_registered_id_present.go | 59 - .../lint_ext_san_rfc822_format_invalid.go | 69 - .../lints/lint_ext_san_rfc822_name_present.go | 59 - .../lints/lint_ext_san_space_dns_name.go | 66 - ...san_uniform_resource_identifier_present.go | 59 - .../lints/lint_ext_san_uri_format_invalid.go | 69 - .../lint_ext_san_uri_host_not_fqdn_or_ip.go | 76 - .../zlint/lints/lint_ext_san_uri_not_ia5.go | 59 - .../zlint/lints/lint_ext_san_uri_relative.go | 70 - ...int_ext_subject_directory_attr_critical.go | 57 - ...int_ext_subject_key_identifier_critical.go | 55 - ...t_ext_subject_key_identifier_missing_ca.go | 69 - ...subject_key_identifier_missing_sub_cert.go | 69 - ...ext_tor_service_descriptor_hash_invalid.go | 210 - ...neralized_time_does_not_include_seconds.go | 96 - ...eralized_time_includes_fraction_seconds.go | 96 - .../lint_generalized_time_not_in_zulu.go | 77 - .../zlint/lints/lint_ian_bare_wildcard.go | 52 - .../lint_ian_dns_name_includes_null_char.go | 52 - .../lint_ian_dns_name_starts_with_period.go | 52 - .../lints/lint_ian_iana_pub_suffix_empty.go | 52 - .../lints/lint_ian_wildcard_not_first.go | 52 - .../lint_idn_dnsname_malformed_unicode.go | 59 - .../lints/lint_idn_dnsname_must_be_nfc.go | 63 - .../lint_inhibit_any_policy_not_critical.go | 63 - .../lints/lint_invalid_certificate_version.go | 53 - .../zmap/zlint/lints/lint_is_redacted_cert.go | 62 - ..._issuer_dn_country_not_printable_string.go | 64 - .../lint_issuer_dn_leading_whitespace.go | 52 - .../lint_issuer_dn_trailing_whitespace.go | 52 - .../zlint/lints/lint_issuer_field_empty.go | 57 - .../zlint/lints/lint_issuer_multiple_rdn.go | 58 - .../zlint/lints/lint_name_constraint_empty.go | 78 - ...lint_name_constraint_maximum_not_absent.go | 126 - .../lint_name_constraint_minimum_non_zero.go | 126 - .../lint_name_constraint_on_edi_party_name.go | 61 - .../lint_name_constraint_on_registered_id.go | 61 - .../lints/lint_name_constraint_on_x400.go | 61 - ...old_root_ca_rsa_mod_less_than_2048_bits.go | 58 - ..._old_sub_ca_rsa_mod_less_than_1024_bits.go | 58 - ...ld_sub_cert_rsa_mod_less_than_1024_bits.go | 55 - ...t_onion_subject_validity_time_too_large.go | 68 - ...path_len_constraint_improperly_included.go | 72 - .../lint_path_len_constraint_zero_or_less.go | 78 - .../lints/lint_public_key_type_not_allowed.go | 50 - ...lint_qcstatem_etsi_present_qcs_critical.go | 66 - .../lint_qcstatem_etsi_type_as_statem.go | 67 - .../lint_qcstatem_mandatory_etsi_statems.go | 70 - .../lints/lint_qcstatem_qccompliance_valid.go | 65 - .../lints/lint_qcstatem_qclimitvalue_valid.go | 99 - .../lints/lint_qcstatem_qcpds_lang_case.go | 89 - .../zlint/lints/lint_qcstatem_qcpds_valid.go | 99 - .../lint_qcstatem_qcretentionperiod_valid.go | 72 - .../zlint/lints/lint_qcstatem_qcsscd_valid.go | 66 - .../zlint/lints/lint_qcstatem_qctype_valid.go | 82 - .../zlint/lints/lint_qcstatem_qctype_web.go | 89 - ...aints_path_len_constraint_field_present.go | 70 - .../lint_root_ca_contains_cert_policy.go | 54 - ...lint_root_ca_extended_key_usage_present.go | 55 - ...lint_root_ca_key_usage_must_be_critical.go | 50 - .../lints/lint_root_ca_key_usage_present.go | 50 - .../zmap/zlint/lints/lint_rsa_exp_negative.go | 52 - ...t_rsa_mod_factors_smaller_than_752_bits.go | 58 - .../lints/lint_rsa_mod_less_than_2048_bits.go | 57 - .../zmap/zlint/lints/lint_rsa_mod_not_odd.go | 60 - .../zlint/lints/lint_rsa_no_public_key.go | 52 - .../lint_rsa_public_exponent_not_in_range.go | 64 - .../lints/lint_rsa_public_exponent_not_odd.go | 58 - .../lint_rsa_public_exponent_too_small.go | 58 - .../zlint/lints/lint_san_bare_wildcard.go | 52 - .../lints/lint_san_dns_name_duplicate.go | 57 - .../lint_san_dns_name_includes_null_char.go | 52 - .../lint_san_dns_name_onion_not_ev_cert.go | 72 - .../lint_san_dns_name_starts_with_period.go | 52 - .../lints/lint_san_iana_pub_suffix_empty.go | 57 - .../lints/lint_san_wildcard_not_first.go | 52 - ...int_serial_number_longer_than_20_octets.go | 66 - .../lints/lint_serial_number_not_positive.go | 66 - .../lint_signature_algorithm_not_supported.go | 50 - ..._spki_rsa_encryption_parameter_not_null.go | 73 - ..._ca_aia_does_not_contain_issuing_ca_url.go | 60 - ...nt_sub_ca_aia_does_not_contain_ocsp_url.go | 60 - .../lints/lint_sub_ca_aia_marked_critical.go | 50 - .../zlint/lints/lint_sub_ca_aia_missing.go | 57 - ...ca_certificate_policies_marked_critical.go | 55 - ...int_sub_ca_certificate_policies_missing.go | 54 - ...istribution_points_does_not_contain_url.go | 58 - ...crl_distribution_points_marked_critical.go | 55 - ..._sub_ca_crl_distribution_points_missing.go | 55 - .../zlint/lints/lint_sub_ca_eku_critical.go | 57 - .../zlint/lints/lint_sub_ca_eku_missing.go | 49 - .../lints/lint_sub_ca_eku_valid_fields.go | 56 - ...nt_sub_ca_name_constraints_not_critical.go | 53 - ...ert_aia_does_not_contain_issuing_ca_url.go | 59 - ..._sub_cert_aia_does_not_contain_ocsp_url.go | 61 - .../lint_sub_cert_aia_marked_critical.go | 50 - .../zlint/lints/lint_sub_cert_aia_missing.go | 58 - .../lints/lint_sub_cert_cert_policy_empty.go | 58 - ...rt_certificate_policies_marked_critical.go | 56 - ...t_sub_cert_certificate_policies_missing.go | 56 - .../lint_sub_cert_country_name_must_appear.go | 50 - ...istribution_points_does_not_contain_url.go | 60 - ...crl_distribution_points_marked_critical.go | 58 - .../lints/lint_sub_cert_eku_extra_values.go | 64 - .../zlint/lints/lint_sub_cert_eku_missing.go | 56 - ...ert_eku_server_auth_client_auth_missing.go | 59 - .../lint_sub_cert_gn_sn_contains_policy.go | 51 - .../zmap/zlint/lints/lint_sub_cert_is_ca.go | 56 - ...nt_sub_cert_key_usage_cert_sign_bit_set.go | 56 - ...int_sub_cert_key_usage_crl_sign_bit_set.go | 56 - ...lint_sub_cert_locality_name_must_appear.go | 52 - ..._sub_cert_locality_name_must_not_appear.go | 50 - .../lint_sub_cert_or_sub_ca_using_sha1.go | 53 - .../lint_sub_cert_postal_code_prohibited.go | 51 - .../lint_sub_cert_province_must_appear.go | 52 - .../lint_sub_cert_province_must_not_appear.go | 50 - .../lint_sub_cert_sha1_expiration_too_long.go | 60 - ...ub_cert_street_address_should_not_exist.go | 51 - ...b_cert_valid_time_longer_than_39_months.go | 48 - ...ub_cert_valid_time_longer_than_825_days.go | 48 - .../lint_subject_common_name_included.go | 54 - .../lint_subject_common_name_max_length.go | 58 - .../lint_subject_common_name_not_from_san.go | 68 - ...lint_subject_contains_malformed_arpa_ip.go | 139 - ...subject_contains_noninformational_value.go | 79 - .../lint_subject_contains_reserved_arpa_ip.go | 232 - .../lint_subject_contains_reserved_ip.go | 59 - .../lints/lint_subject_country_not_iso.go | 60 - ...subject_dn_country_not_printable_string.go | 64 - .../lint_subject_dn_leading_whitespace.go | 52 - ...int_subject_dn_not_printable_characters.go | 73 - ...int_subject_dn_serial_number_max_length.go | 50 - ...t_dn_serial_number_not_printable_string.go | 64 - .../lint_subject_dn_trailing_whitespace.go | 52 - .../lints/lint_subject_email_max_length.go | 67 - .../lints/lint_subject_empty_without_san.go | 69 - .../lint_subject_given_name_max_length.go | 61 - ...int_subject_info_access_marked_critical.go | 53 - .../lint_subject_locality_name_max_length.go | 60 - .../zlint/lints/lint_subject_multiple_rdn.go | 57 - .../zmap/zlint/lints/lint_subject_not_dn.go | 60 - ...nt_subject_organization_name_max_length.go | 60 - ...ect_organizational_unit_name_max_length.go | 60 - .../lint_subject_postal_code_max_length.go | 61 - .../lint_subject_printable_string_badalpha.go | 108 - .../lint_subject_state_name_max_length.go | 60 - .../lint_subject_street_address_max_length.go | 59 - .../lints/lint_subject_surname_max_length.go | 61 - ...ature_rsa_encryption_parameter_not_null.go | 81 - .../lint_utc_time_does_not_include_seconds.go | 82 - .../zlint/lints/lint_utc_time_not_in_zulu.go | 97 - .../lints/lint_validity_time_not_positive.go | 52 - .../lints/lint_wrong_time_format_pre2050.go | 85 - vendor/github.com/zmap/zlint/lints/result.go | 106 - .../zmap/zlint/lints/testingUtil.go | 51 - vendor/github.com/zmap/zlint/makefile | 26 - vendor/github.com/zmap/zlint/newLint.sh | 34 - vendor/github.com/zmap/zlint/template | 44 - .../zmap/zlint/util/algorithm_identifier.go | 86 - vendor/github.com/zmap/zlint/util/ca.go | 57 - .../github.com/zmap/zlint/util/countries.go | 51 - .../github.com/zmap/zlint/util/encodings.go | 136 - vendor/github.com/zmap/zlint/util/ev.go | 71 - vendor/github.com/zmap/zlint/util/fqdn.go | 127 - vendor/github.com/zmap/zlint/util/gtld.go | 122 - vendor/github.com/zmap/zlint/util/gtld_map.go | 7835 ------ vendor/github.com/zmap/zlint/util/ip.go | 115 - vendor/github.com/zmap/zlint/util/ku.go | 18 - vendor/github.com/zmap/zlint/util/names.go | 64 - vendor/github.com/zmap/zlint/util/oid.go | 184 - vendor/github.com/zmap/zlint/util/primes.go | 57 - vendor/github.com/zmap/zlint/util/qc_stmt.go | 285 - vendor/github.com/zmap/zlint/util/rdn.go | 26 - vendor/github.com/zmap/zlint/util/time.go | 83 - vendor/github.com/zmap/zlint/zlint.go | 87 - vendor/go.opencensus.io/.gitignore | 9 + vendor/go.opencensus.io/.travis.yml | 17 + vendor/go.opencensus.io/Gopkg.lock | 231 - vendor/go.opencensus.io/Gopkg.toml | 36 - vendor/go.opencensus.io/README.md | 6 +- vendor/go.opencensus.io/appveyor.yml | 24 + vendor/go.opencensus.io/go.mod | 7 +- vendor/go.opencensus.io/go.sum | 20 +- vendor/go.opencensus.io/internal/internal.go | 2 +- vendor/go.opencensus.io/opencensus.go | 2 +- .../plugin/ocgrpc/client_stats_handler.go | 4 +- .../plugin/ocgrpc/stats_common.go | 8 +- .../propagation/tracecontext/propagation.go | 187 - .../go.opencensus.io/plugin/ochttp/server.go | 12 +- .../go.opencensus.io/plugin/ochttp/stats.go | 18 +- .../go.opencensus.io/plugin/ochttp/trace.go | 2 + vendor/go.opencensus.io/stats/units.go | 1 + .../stats/view/aggregation.go | 11 +- .../stats/view/aggregation_data.go | 6 +- vendor/go.opencensus.io/stats/view/doc.go | 2 +- vendor/go.opencensus.io/stats/view/view.go | 6 +- .../stats/view/view_to_metric.go | 11 +- vendor/go.opencensus.io/tag/key.go | 5 +- vendor/go.opencensus.io/tag/map_codec.go | 2 +- vendor/go.opencensus.io/trace/lrumap.go | 40 +- vendor/go.opencensus.io/trace/trace.go | 6 +- vendor/go.uber.org/atomic/.codecov.yml | 15 + vendor/go.uber.org/atomic/.gitignore | 11 + vendor/go.uber.org/atomic/.travis.yml | 23 + vendor/go.uber.org/multierr/.codecov.yml | 15 + vendor/go.uber.org/multierr/.gitignore | 1 + vendor/go.uber.org/multierr/.travis.yml | 33 + vendor/go.uber.org/zap/.codecov.yml | 17 + vendor/go.uber.org/zap/.gitignore | 28 + vendor/go.uber.org/zap/.readme.tmpl | 108 + vendor/go.uber.org/zap/.travis.yml | 23 + vendor/golang.org/x/crypto/AUTHORS | 3 + vendor/golang.org/x/crypto/CONTRIBUTORS | 3 + vendor/golang.org/x/crypto/cryptobyte/asn1.go | 751 - .../x/crypto/cryptobyte/asn1/asn1.go | 46 - .../golang.org/x/crypto/cryptobyte/builder.go | 337 - .../golang.org/x/crypto/cryptobyte/string.go | 166 - vendor/golang.org/x/crypto/ocsp/ocsp.go | 784 - .../x/crypto/openpgp/armor/armor.go | 21 +- .../x/crypto/openpgp/elgamal/elgamal.go | 4 +- .../x/crypto/openpgp/packet/encrypted_key.go | 6 +- .../x/crypto/openpgp/packet/private_key.go | 2 +- vendor/golang.org/x/crypto/pkcs12/pkcs12.go | 1 + .../x/crypto/sha3/hashes_generic.go | 2 +- vendor/golang.org/x/crypto/sha3/sha3.go | 23 +- vendor/golang.org/x/crypto/sha3/sha3_s390x.go | 4 +- vendor/golang.org/x/crypto/sha3/sha3_s390x.s | 2 +- .../golang.org/x/crypto/sha3/shake_generic.go | 2 +- vendor/golang.org/x/crypto/sha3/xor.go | 7 + .../golang.org/x/crypto/sha3/xor_unaligned.go | 9 +- .../x/crypto/ssh/terminal/terminal.go | 4 + .../x/crypto/ssh/terminal/util_windows.go | 4 +- vendor/golang.org/x/exp/AUTHORS | 3 + vendor/golang.org/x/exp/CONTRIBUTORS | 3 + .../GO_LICENSE => golang.org/x/exp/LICENSE} | 0 vendor/golang.org/x/exp/PATENTS | 22 + vendor/golang.org/x/exp/apidiff/README.md | 624 + vendor/golang.org/x/exp/apidiff/apidiff.go | 220 + .../golang.org/x/exp/apidiff/compatibility.go | 361 + .../x/exp/apidiff/correspondence.go | 219 + vendor/golang.org/x/exp/apidiff/messageset.go | 79 + vendor/golang.org/x/exp/apidiff/report.go | 71 + vendor/golang.org/x/exp/cmd/apidiff/main.go | 142 + vendor/golang.org/x/lint/.travis.yml | 19 + vendor/golang.org/x/lint/CONTRIBUTING.md | 15 + vendor/golang.org/x/lint/LICENSE | 27 + vendor/golang.org/x/lint/README.md | 88 + vendor/golang.org/x/lint/go.mod | 5 + vendor/golang.org/x/lint/go.sum | 8 + vendor/golang.org/x/lint/golint/golint.go | 159 + vendor/golang.org/x/lint/golint/import.go | 309 + .../golang.org/x/lint/golint/importcomment.go | 13 + vendor/golang.org/x/lint/lint.go | 1614 ++ vendor/golang.org/x/net/AUTHORS | 3 + vendor/golang.org/x/net/CONTRIBUTORS | 3 + vendor/golang.org/x/net/http2/.gitignore | 2 + vendor/golang.org/x/net/http2/hpack/encode.go | 2 +- vendor/golang.org/x/net/http2/pipe.go | 7 +- vendor/golang.org/x/net/http2/server.go | 14 +- vendor/golang.org/x/net/http2/transport.go | 70 +- .../x/net/http2/writesched_priority.go | 2 +- vendor/golang.org/x/net/icmp/listen_posix.go | 3 + vendor/golang.org/x/net/idna/tables11.0.0.go | 2 +- vendor/golang.org/x/net/idna/tables12.00.go | 4733 ++++ .../x/net/internal/socket/norace.go | 12 + .../golang.org/x/net/internal/socket/race.go | 37 + .../x/net/internal/socket/rawconn_mmsg.go | 6 + .../x/net/internal/socket/rawconn_msg.go | 2 + .../x/net/internal/socket/sys_dragonfly.go | 27 +- .../x/net/internal/socket/zsys_aix_ppc64.go | 1 - .../x/net/internal/socket/zsys_linux_386.go | 1 - .../x/net/internal/socket/zsys_linux_amd64.go | 1 - .../x/net/internal/socket/zsys_linux_arm.go | 6 +- .../x/net/internal/socket/zsys_linux_arm64.go | 6 +- .../x/net/internal/socket/zsys_linux_mips.go | 6 +- .../net/internal/socket/zsys_linux_mips64.go | 6 +- .../internal/socket/zsys_linux_mips64le.go | 6 +- .../net/internal/socket/zsys_linux_mipsle.go | 6 +- .../x/net/internal/socket/zsys_linux_ppc64.go | 6 +- .../net/internal/socket/zsys_linux_ppc64le.go | 6 +- .../net/internal/socket/zsys_linux_riscv64.go | 6 +- .../x/net/internal/socket/zsys_linux_s390x.go | 6 +- .../x/net/internal/socket/zsys_netbsd_386.go | 6 +- .../net/internal/socket/zsys_netbsd_amd64.go | 6 +- .../x/net/internal/socket/zsys_netbsd_arm.go | 6 +- .../net/internal/socket/zsys_netbsd_arm64.go | 1 - .../golang.org/x/net/internal/socks/socks.go | 2 +- .../x/net/internal/timeseries/timeseries.go | 6 +- vendor/golang.org/x/net/ipv4/control_bsd.go | 3 +- vendor/golang.org/x/net/ipv4/sys_bpf.go | 7 +- vendor/golang.org/x/net/ipv4/sys_linux.go | 3 +- .../x/net/ipv4/zsys_freebsd_arm64.go | 93 + .../golang.org/x/net/ipv4/zsys_linux_386.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_amd64.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_arm.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_arm64.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_mips.go | 18 - .../x/net/ipv4/zsys_linux_mips64.go | 18 - .../x/net/ipv4/zsys_linux_mips64le.go | 18 - .../x/net/ipv4/zsys_linux_mipsle.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_ppc.go | 18 - .../golang.org/x/net/ipv4/zsys_linux_ppc64.go | 18 - .../x/net/ipv4/zsys_linux_ppc64le.go | 18 - .../x/net/ipv4/zsys_linux_riscv64.go | 17 - .../golang.org/x/net/ipv4/zsys_linux_s390x.go | 18 - vendor/golang.org/x/net/ipv6/sys_bpf.go | 7 +- vendor/golang.org/x/net/ipv6/sys_linux.go | 3 +- .../x/net/ipv6/zsys_freebsd_arm64.go | 122 + .../golang.org/x/net/ipv6/zsys_linux_386.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_amd64.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_arm.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_arm64.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_mips.go | 18 - .../x/net/ipv6/zsys_linux_mips64.go | 18 - .../x/net/ipv6/zsys_linux_mips64le.go | 18 - .../x/net/ipv6/zsys_linux_mipsle.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_ppc.go | 18 - .../golang.org/x/net/ipv6/zsys_linux_ppc64.go | 18 - .../x/net/ipv6/zsys_linux_ppc64le.go | 18 - .../x/net/ipv6/zsys_linux_riscv64.go | 17 - .../golang.org/x/net/ipv6/zsys_linux_s390x.go | 18 - vendor/golang.org/x/net/publicsuffix/table.go | 19352 +++++++------- vendor/golang.org/x/oauth2/.travis.yml | 13 + vendor/golang.org/x/oauth2/README.md | 13 +- vendor/golang.org/x/oauth2/transport.go | 79 +- vendor/golang.org/x/sync/AUTHORS | 3 + vendor/golang.org/x/sync/CONTRIBUTORS | 3 + vendor/golang.org/x/sys/AUTHORS | 3 + vendor/golang.org/x/sys/CONTRIBUTORS | 3 + vendor/golang.org/x/sys/cpu/byteorder.go | 38 +- vendor/golang.org/x/sys/cpu/cpu.go | 36 + vendor/golang.org/x/sys/cpu/cpu_arm.go | 33 +- vendor/golang.org/x/sys/cpu/cpu_arm64.go | 134 + vendor/golang.org/x/sys/cpu/cpu_arm64.s | 31 + vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go | 11 + .../golang.org/x/sys/cpu/cpu_gccgo_arm64.go | 11 + .../sys/cpu/{cpu_gccgo.c => cpu_gccgo_x86.c} | 0 .../cpu/{cpu_gccgo.go => cpu_gccgo_x86.go} | 0 vendor/golang.org/x/sys/cpu/cpu_linux.go | 48 +- vendor/golang.org/x/sys/cpu/cpu_linux_arm.go | 39 + .../golang.org/x/sys/cpu/cpu_linux_arm64.go | 8 +- .../golang.org/x/sys/cpu/cpu_linux_noinit.go | 9 + vendor/golang.org/x/sys/cpu/cpu_mips64x.go | 2 - vendor/golang.org/x/sys/cpu/cpu_mipsx.go | 2 - .../golang.org/x/sys/cpu/cpu_other_arm64.go | 2 - vendor/golang.org/x/sys/cpu/cpu_riscv64.go | 9 + vendor/golang.org/x/sys/cpu/cpu_wasm.go | 2 - vendor/golang.org/x/sys/cpu/hwcap_linux.go | 56 + vendor/golang.org/x/sys/unix/.gitignore | 2 + .../golang.org/x/sys/unix/affinity_linux.go | 46 +- .../golang.org/x/sys/unix/bluetooth_linux.go | 1 + vendor/golang.org/x/sys/unix/fcntl.go | 12 +- vendor/golang.org/x/sys/unix/fdset.go | 29 + vendor/golang.org/x/sys/unix/ioctl.go | 41 +- vendor/golang.org/x/sys/unix/mkall.sh | 6 +- vendor/golang.org/x/sys/unix/mkerrors.sh | 60 +- .../x/sys/unix/sockcmsg_dragonfly.go | 16 + .../golang.org/x/sys/unix/sockcmsg_linux.go | 2 +- vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 36 +- .../x/sys/unix/sockcmsg_unix_other.go | 38 + vendor/golang.org/x/sys/unix/syscall_aix.go | 39 +- .../golang.org/x/sys/unix/syscall_aix_ppc.go | 4 + .../x/sys/unix/syscall_aix_ppc64.go | 4 + vendor/golang.org/x/sys/unix/syscall_bsd.go | 6 +- .../x/sys/unix/syscall_darwin.1_12.go | 29 + .../x/sys/unix/syscall_darwin.1_13.go | 101 + .../golang.org/x/sys/unix/syscall_darwin.go | 41 +- .../x/sys/unix/syscall_darwin_386.1_11.go | 9 + .../x/sys/unix/syscall_darwin_386.go | 5 +- .../x/sys/unix/syscall_darwin_amd64.1_11.go | 9 + .../x/sys/unix/syscall_darwin_amd64.go | 5 +- .../x/sys/unix/syscall_darwin_arm.1_11.go | 11 + .../x/sys/unix/syscall_darwin_arm.go | 8 +- .../x/sys/unix/syscall_darwin_arm64.1_11.go | 11 + .../x/sys/unix/syscall_darwin_arm64.go | 8 +- .../x/sys/unix/syscall_darwin_libSystem.go | 2 + .../x/sys/unix/syscall_dragonfly.go | 59 +- .../x/sys/unix/syscall_dragonfly_amd64.go | 4 + .../golang.org/x/sys/unix/syscall_freebsd.go | 48 +- .../x/sys/unix/syscall_freebsd_386.go | 4 + .../x/sys/unix/syscall_freebsd_amd64.go | 4 + .../x/sys/unix/syscall_freebsd_arm.go | 4 + .../x/sys/unix/syscall_freebsd_arm64.go | 4 + vendor/golang.org/x/sys/unix/syscall_linux.go | 304 +- .../x/sys/unix/syscall_linux_386.go | 4 + .../x/sys/unix/syscall_linux_amd64.go | 4 + .../x/sys/unix/syscall_linux_arm.go | 4 + .../x/sys/unix/syscall_linux_arm64.go | 4 + .../x/sys/unix/syscall_linux_mips64x.go | 4 + .../x/sys/unix/syscall_linux_mipsx.go | 4 + .../x/sys/unix/syscall_linux_ppc64x.go | 4 + .../x/sys/unix/syscall_linux_riscv64.go | 4 + .../x/sys/unix/syscall_linux_s390x.go | 4 + .../x/sys/unix/syscall_linux_sparc64.go | 4 + .../golang.org/x/sys/unix/syscall_netbsd.go | 50 +- .../x/sys/unix/syscall_netbsd_386.go | 4 + .../x/sys/unix/syscall_netbsd_amd64.go | 4 + .../x/sys/unix/syscall_netbsd_arm.go | 4 + .../x/sys/unix/syscall_netbsd_arm64.go | 4 + .../golang.org/x/sys/unix/syscall_openbsd.go | 41 +- .../x/sys/unix/syscall_openbsd_386.go | 4 + .../x/sys/unix/syscall_openbsd_amd64.go | 4 + .../x/sys/unix/syscall_openbsd_arm.go | 4 + .../x/sys/unix/syscall_openbsd_arm64.go | 4 + .../golang.org/x/sys/unix/syscall_solaris.go | 34 +- .../x/sys/unix/syscall_solaris_amd64.go | 4 + .../golang.org/x/sys/unix/zerrors_aix_ppc.go | 12 +- .../x/sys/unix/zerrors_aix_ppc64.go | 12 +- .../x/sys/unix/zerrors_darwin_386.go | 3 +- .../x/sys/unix/zerrors_darwin_amd64.go | 3 +- .../x/sys/unix/zerrors_darwin_arm.go | 3 +- .../x/sys/unix/zerrors_darwin_arm64.go | 3 +- .../x/sys/unix/zerrors_dragonfly_amd64.go | 1 + .../x/sys/unix/zerrors_freebsd_386.go | 3 +- .../x/sys/unix/zerrors_freebsd_amd64.go | 3 +- .../x/sys/unix/zerrors_freebsd_arm.go | 3 +- .../x/sys/unix/zerrors_freebsd_arm64.go | 3 +- .../x/sys/unix/zerrors_linux_386.go | 5467 ++-- .../x/sys/unix/zerrors_linux_amd64.go | 5467 ++-- .../x/sys/unix/zerrors_linux_arm.go | 5479 ++-- .../x/sys/unix/zerrors_linux_arm64.go | 5451 ++-- .../x/sys/unix/zerrors_linux_mips.go | 5471 ++-- .../x/sys/unix/zerrors_linux_mips64.go | 5471 ++-- .../x/sys/unix/zerrors_linux_mips64le.go | 5471 ++-- .../x/sys/unix/zerrors_linux_mipsle.go | 5471 ++-- .../x/sys/unix/zerrors_linux_ppc64.go | 5589 +++-- .../x/sys/unix/zerrors_linux_ppc64le.go | 5589 +++-- .../x/sys/unix/zerrors_linux_riscv64.go | 5441 ++-- .../x/sys/unix/zerrors_linux_s390x.go | 5587 +++-- .../x/sys/unix/zerrors_linux_sparc64.go | 5567 +++-- .../x/sys/unix/zerrors_netbsd_386.go | 3 +- .../x/sys/unix/zerrors_netbsd_amd64.go | 3 +- .../x/sys/unix/zerrors_netbsd_arm.go | 3 +- .../x/sys/unix/zerrors_netbsd_arm64.go | 3 +- .../x/sys/unix/zerrors_openbsd_386.go | 17 +- .../x/sys/unix/zerrors_openbsd_amd64.go | 6 +- .../x/sys/unix/zerrors_openbsd_arm.go | 11 +- .../x/sys/unix/zerrors_openbsd_arm64.go | 1 + .../x/sys/unix/zerrors_solaris_amd64.go | 3 +- .../golang.org/x/sys/unix/zptrace386_linux.go | 80 - .../x/sys/unix/zptrace_armnn_linux.go | 41 + .../x/sys/unix/zptrace_linux_arm64.go | 17 + .../x/sys/unix/zptrace_mipsnn_linux.go | 50 + .../x/sys/unix/zptrace_mipsnnle_linux.go | 50 + .../x/sys/unix/zptrace_x86_linux.go | 80 + .../golang.org/x/sys/unix/zptracearm_linux.go | 41 - .../x/sys/unix/zptracemips_linux.go | 50 - .../x/sys/unix/zptracemipsle_linux.go | 50 - .../x/sys/unix/zsyscall_darwin_386.1_11.go | 95 +- .../x/sys/unix/zsyscall_darwin_386.1_13.go | 41 + .../x/sys/unix/zsyscall_darwin_386.1_13.s | 12 + .../x/sys/unix/zsyscall_darwin_386.go | 116 +- .../x/sys/unix/zsyscall_darwin_386.s | 12 +- .../x/sys/unix/zsyscall_darwin_amd64.1_11.go | 115 +- .../x/sys/unix/zsyscall_darwin_amd64.1_13.go | 41 + .../x/sys/unix/zsyscall_darwin_amd64.1_13.s | 12 + .../x/sys/unix/zsyscall_darwin_amd64.go | 101 +- .../x/sys/unix/zsyscall_darwin_amd64.s | 10 +- .../x/sys/unix/zsyscall_darwin_arm.1_11.go | 71 +- .../x/sys/unix/zsyscall_darwin_arm.1_13.go | 41 + .../x/sys/unix/zsyscall_darwin_arm.1_13.s | 12 + .../x/sys/unix/zsyscall_darwin_arm.go | 94 +- .../x/sys/unix/zsyscall_darwin_arm.s | 10 +- .../x/sys/unix/zsyscall_darwin_arm64.1_11.go | 71 +- .../x/sys/unix/zsyscall_darwin_arm64.1_13.go | 41 + .../x/sys/unix/zsyscall_darwin_arm64.1_13.s | 12 + .../x/sys/unix/zsyscall_darwin_arm64.go | 94 +- .../x/sys/unix/zsyscall_darwin_arm64.s | 10 +- .../x/sys/unix/zsyscall_dragonfly_amd64.go | 16 +- .../x/sys/unix/zsyscall_freebsd_386.go | 16 +- .../x/sys/unix/zsyscall_freebsd_amd64.go | 56 +- .../x/sys/unix/zsyscall_freebsd_arm.go | 56 +- .../x/sys/unix/zsyscall_freebsd_arm64.go | 56 +- .../x/sys/unix/zsyscall_linux_386.go | 143 +- .../x/sys/unix/zsyscall_linux_amd64.go | 143 +- .../x/sys/unix/zsyscall_linux_arm.go | 143 +- .../x/sys/unix/zsyscall_linux_arm64.go | 143 +- .../x/sys/unix/zsyscall_linux_mips.go | 143 +- .../x/sys/unix/zsyscall_linux_mips64.go | 143 +- .../x/sys/unix/zsyscall_linux_mips64le.go | 143 +- .../x/sys/unix/zsyscall_linux_mipsle.go | 143 +- .../x/sys/unix/zsyscall_linux_ppc64.go | 143 +- .../x/sys/unix/zsyscall_linux_ppc64le.go | 143 +- .../x/sys/unix/zsyscall_linux_riscv64.go | 143 +- .../x/sys/unix/zsyscall_linux_s390x.go | 143 +- .../x/sys/unix/zsyscall_linux_sparc64.go | 143 +- .../x/sys/unix/zsyscall_netbsd_386.go | 83 +- .../x/sys/unix/zsyscall_netbsd_amd64.go | 83 +- .../x/sys/unix/zsyscall_netbsd_arm.go | 83 +- .../x/sys/unix/zsyscall_netbsd_arm64.go | 83 +- .../x/sys/unix/zsyscall_openbsd_386.go | 58 +- .../x/sys/unix/zsyscall_openbsd_amd64.go | 58 +- .../x/sys/unix/zsyscall_openbsd_arm.go | 58 +- .../x/sys/unix/zsyscall_openbsd_arm64.go | 58 +- .../x/sys/unix/zsyscall_solaris_amd64.go | 5 +- .../x/sys/unix/zsysnum_linux_386.go | 2 + .../x/sys/unix/zsysnum_linux_amd64.go | 2 + .../x/sys/unix/zsysnum_linux_arm.go | 2 + .../x/sys/unix/zsysnum_linux_arm64.go | 1 + .../x/sys/unix/zsysnum_linux_mips.go | 2 + .../x/sys/unix/zsysnum_linux_mips64.go | 2 + .../x/sys/unix/zsysnum_linux_mips64le.go | 2 + .../x/sys/unix/zsysnum_linux_mipsle.go | 2 + .../x/sys/unix/zsysnum_linux_ppc64.go | 2 + .../x/sys/unix/zsysnum_linux_ppc64le.go | 2 + .../x/sys/unix/zsysnum_linux_riscv64.go | 2 + .../x/sys/unix/zsysnum_linux_s390x.go | 2 + .../x/sys/unix/zsysnum_linux_sparc64.go | 1 + .../x/sys/unix/ztypes_freebsd_arm64.go | 2 +- .../golang.org/x/sys/unix/ztypes_linux_386.go | 321 +- .../x/sys/unix/ztypes_linux_amd64.go | 322 +- .../golang.org/x/sys/unix/ztypes_linux_arm.go | 322 +- .../x/sys/unix/ztypes_linux_arm64.go | 322 +- .../x/sys/unix/ztypes_linux_mips.go | 322 +- .../x/sys/unix/ztypes_linux_mips64.go | 323 +- .../x/sys/unix/ztypes_linux_mips64le.go | 323 +- .../x/sys/unix/ztypes_linux_mipsle.go | 322 +- .../x/sys/unix/ztypes_linux_ppc64.go | 322 +- .../x/sys/unix/ztypes_linux_ppc64le.go | 322 +- .../x/sys/unix/ztypes_linux_riscv64.go | 322 +- .../x/sys/unix/ztypes_linux_s390x.go | 322 +- .../x/sys/unix/ztypes_linux_sparc64.go | 322 +- .../x/sys/unix/ztypes_netbsd_386.go | 32 + .../x/sys/unix/ztypes_netbsd_amd64.go | 33 + .../x/sys/unix/ztypes_netbsd_arm.go | 32 + .../x/sys/unix/ztypes_netbsd_arm64.go | 33 + .../x/sys/windows/asm_windows_386.s | 13 - .../x/sys/windows/asm_windows_amd64.s | 13 - .../x/sys/windows/asm_windows_arm.s | 11 - .../golang.org/x/sys/windows/dll_windows.go | 22 +- vendor/golang.org/x/sys/windows/empty.s | 8 + vendor/golang.org/x/sys/windows/mkerrors.bash | 0 .../x/sys/windows/mkknownfolderids.bash | 0 vendor/golang.org/x/sys/windows/mksyscall.go | 2 +- .../x/sys/windows/registry/mksyscall.go | 2 +- .../x/sys/windows/registry/value.go | 11 +- .../x/sys/windows/security_windows.go | 600 +- .../x/sys/windows/svc/mgr/config.go | 181 - .../golang.org/x/sys/windows/svc/mgr/mgr.go | 211 - .../x/sys/windows/svc/mgr/recovery.go | 135 - .../x/sys/windows/svc/mgr/service.go | 75 - .../x/sys/windows/syscall_windows.go | 152 +- .../golang.org/x/sys/windows/types_windows.go | 147 +- .../x/sys/windows/zsyscall_windows.go | 1346 +- vendor/golang.org/x/text/CONTRIBUTING.md | 26 - vendor/golang.org/x/text/README.md | 93 - vendor/golang.org/x/text/codereview.cfg | 1 - vendor/golang.org/x/text/doc.go | 16 - vendor/golang.org/x/text/go.mod | 3 - vendor/golang.org/x/text/go.sum | 2 - vendor/golang.org/x/time/AUTHORS | 3 + vendor/golang.org/x/time/CONTRIBUTORS | 3 + vendor/golang.org/x/tools/AUTHORS | 3 + vendor/golang.org/x/tools/CONTRIBUTORS | 3 + .../x/tools/cmd/goimports/goimports.go | 8 +- .../x/tools/cmd/stringer/stringer.go | 650 + .../x/tools/go/analysis/analysis.go | 221 + .../x/tools/go/analysis/diagnostic.go | 61 + vendor/golang.org/x/tools/go/analysis/doc.go | 334 + .../go/analysis/passes/inspect/inspect.go | 49 + .../x/tools/go/analysis/validate.go | 97 + .../x/tools/go/ast/inspector/inspector.go | 182 + .../x/tools/go/ast/inspector/typeof.go | 216 + .../x/tools/go/buildutil/overlay.go | 2 +- .../x/tools/go/gcexportdata/gcexportdata.go | 2 +- .../golang.org/x/tools/go/internal/cgo/cgo.go | 220 - .../x/tools/go/internal/cgo/cgo_pkgconfig.go | 39 - .../x/tools/go/internal/gcimporter/bimport.go | 11 +- .../x/tools/go/internal/gcimporter/iexport.go | 34 +- .../x/tools/go/internal/gcimporter/iimport.go | 68 +- .../tools/go/internal/packagesdriver/sizes.go | 17 +- vendor/golang.org/x/tools/go/loader/doc.go | 204 - vendor/golang.org/x/tools/go/loader/loader.go | 1086 - vendor/golang.org/x/tools/go/loader/util.go | 124 - vendor/golang.org/x/tools/go/packages/doc.go | 3 +- .../x/tools/go/packages/external.go | 9 +- .../golang.org/x/tools/go/packages/golist.go | 162 +- .../x/tools/go/packages/golist_overlay.go | 50 +- .../x/tools/go/packages/loadmode_string.go | 57 + .../x/tools/go/packages/packages.go | 110 +- .../x/tools/go/types/objectpath/objectpath.go | 523 + .../x/tools/go/types/typeutil/callee.go | 46 + .../x/tools/go/types/typeutil/imports.go | 31 + .../x/tools/go/types/typeutil/map.go | 313 + .../tools/go/types/typeutil/methodsetcache.go | 72 + .../x/tools/go/types/typeutil/ui.go | 52 + vendor/golang.org/x/tools/imports/forward.go | 62 - .../x/tools/internal/gopathwalk/walk.go | 45 +- .../x/tools/internal/imports/fix.go | 348 +- .../x/tools/internal/imports/imports.go | 42 +- .../x/tools/internal/imports/mod.go | 520 +- .../x/tools/internal/imports/mod_cache.go | 122 +- .../x/tools/internal/imports/zstdlib.go | 20690 +++++++-------- vendor/google.golang.org/api/AUTHORS | 11 + vendor/google.golang.org/api/CONTRIBUTORS | 56 + .../cloudfunctions/v1/cloudfunctions-api.json | 59 +- .../cloudfunctions/v1/cloudfunctions-gen.go | 204 +- .../api/compute/v1/compute-api.json | 21 +- .../api/compute/v1/compute-gen.go | 1059 +- .../api/gensupport/backoff.go | 51 - .../api/gensupport/buffer.go | 79 - .../google.golang.org/api/gensupport/doc.go | 10 - .../api/gensupport/header.go | 22 - .../google.golang.org/api/gensupport/json.go | 211 - .../api/gensupport/jsonfloat.go | 57 - .../google.golang.org/api/gensupport/media.go | 363 - .../api/gensupport/params.go | 51 - .../api/gensupport/resumable.go | 216 - .../google.golang.org/api/gensupport/retry.go | 84 - .../google.golang.org/api/gensupport/send.go | 87 - .../api/googleapi/googleapi.go | 21 +- .../googleapi/internal/uritemplates/LICENSE | 18 - .../internal/uritemplates/uritemplates.go | 248 - .../googleapi/internal/uritemplates/utils.go | 17 - .../api/googleapi/transport/apikey.go | 8 +- .../google.golang.org/api/googleapi/types.go | 2 +- .../google.golang.org/api/internal/creds.go | 16 +- .../api/internal/gensupport/media.go | 11 +- vendor/google.golang.org/api/internal/pool.go | 16 +- .../api/internal/settings.go | 43 +- .../api/iterator/iterator.go | 36 +- .../api/option/credentials_go19.go | 16 +- .../api/option/credentials_notgo19.go | 16 +- vendor/google.golang.org/api/option/option.go | 31 +- .../api/storage/v1/storage-api.json | 38 +- .../api/storage/v1/storage-gen.go | 127 +- .../api/support/bundler/bundler.go | 366 +- .../google.golang.org/api/transport/dial.go | 16 +- vendor/google.golang.org/api/transport/doc.go | 16 +- .../google.golang.org/api/transport/go19.go | 16 +- .../api/transport/grpc/dial.go | 23 +- .../api/transport/grpc/dial_appengine.go | 16 +- .../api/transport/grpc/dial_socketopt.go | 16 +- .../api/transport/http/dial.go | 32 +- .../api/transport/http/dial_appengine.go | 16 +- .../http/internal/propagation/http.go | 16 +- .../api/transport/not_go19.go | 16 +- .../google.golang.org/appengine/.travis.yml | 20 + .../appengine/datastore/datastore.go | 407 - .../appengine/datastore/doc.go | 361 - .../datastore/internal/cloudkey/cloudkey.go | 120 - .../datastore/internal/cloudpb/entity.pb.go | 344 - .../appengine/datastore/key.go | 400 - .../appengine/datastore/keycompat.go | 89 - .../appengine/datastore/load.go | 429 - .../appengine/datastore/metadata.go | 78 - .../appengine/datastore/prop.go | 330 - .../appengine/datastore/query.go | 774 - .../appengine/datastore/save.go | 333 - .../appengine/datastore/transaction.go | 96 - vendor/google.golang.org/appengine/go.mod | 5 +- vendor/google.golang.org/appengine/go.sum | 11 - .../internal/datastore/datastore_v3.proto | 0 .../appengine/internal/net.go | 2 +- .../appengine/internal/regen.sh | 0 .../appengine/travis_install.sh | 0 .../appengine/travis_test.sh | 0 .../googleapis/api/annotations/resource.pb.go | 268 +- .../googleapis/api/httpbody/httpbody.pb.go | 146 - .../googleapis/api/metric/metric.pb.go | 101 +- .../googleapis/datastore/v1/datastore.pb.go | 1808 ++ .../googleapis/datastore/v1/entity.pb.go | 673 + .../googleapis/datastore/v1/query.pb.go | 1153 + .../googleapis/iam/v1/iam_policy.pb.go | 81 +- .../genproto/googleapis/iam/v1/options.pb.go | 10 +- .../genproto/googleapis/iam/v1/policy.pb.go | 65 +- .../googleapis/monitoring/v3/alert.pb.go | 4 +- .../googleapis/monitoring/v3/service.pb.go | 2 +- .../googleapis/pubsub/v1/pubsub.pb.go | 617 +- .../googleapis/type/latlng/latlng.pb.go | 97 + .../protobuf/field_mask/field_mask.pb.go | 2 +- vendor/google.golang.org/grpc/.travis.yml | 42 + vendor/google.golang.org/grpc/Makefile | 3 + .../grpc/attributes/attributes.go | 70 + .../grpc/balancer/balancer.go | 107 +- .../grpc/balancer/base/balancer.go | 137 +- .../grpc/balancer/base/base.go | 29 + .../grpclb/grpc_lb_v1/load_balancer.pb.go | 152 +- .../grpc/balancer/grpclb/grpclb.go | 16 +- .../grpc/balancer/grpclb/grpclb_picker.go | 27 +- .../balancer/grpclb/grpclb_remote_balancer.go | 15 +- .../grpc/balancer/grpclb/grpclb_util.go | 9 +- .../grpc/balancer/grpclb/regenerate.sh | 0 .../grpc/balancer/roundrobin/roundrobin.go | 18 +- .../grpc/balancer_conn_wrappers.go | 25 +- .../grpc/balancer_v1_wrapper.go | 34 +- vendor/google.golang.org/grpc/clientconn.go | 103 +- vendor/google.golang.org/grpc/codegen.sh | 0 .../alts/internal/authinfo/authinfo.go | 2 + .../alts/internal/handshaker/handshaker.go | 30 +- .../internal/proto/grpc_gcp/handshaker.pb.go | 202 +- .../credentials/alts/internal/regenerate.sh | 0 .../grpc/credentials/alts/utils.go | 19 + .../grpc/credentials/credentials.go | 299 +- .../grpc/credentials/{tls13.go => go12.go} | 0 .../grpc/credentials/oauth/oauth.go | 12 + .../google.golang.org/grpc/credentials/tls.go | 225 + vendor/google.golang.org/grpc/dialoptions.go | 31 +- vendor/google.golang.org/grpc/go.mod | 2 +- vendor/google.golang.org/grpc/go.sum | 4 +- vendor/google.golang.org/grpc/install_gae.sh | 0 .../grpc/internal/binarylog/binarylog.go | 10 +- .../grpc/internal/binarylog/regenerate.sh | 0 .../grpc/internal/buffer/unbounded.go | 7 + .../grpc/internal/envconfig/envconfig.go | 7 +- .../grpc/internal/internal.go | 4 +- .../internal/resolver/dns/dns_resolver.go | 217 +- .../grpc/internal/resolver/dns/go113.go | 33 + .../resolver/passthrough/passthrough.go | 4 +- .../grpc/internal/transport/handler_server.go | 10 +- .../grpc/internal/transport/http2_client.go | 20 +- .../grpc/internal/transport/http2_server.go | 114 +- .../grpc/internal/transport/transport.go | 9 +- .../google.golang.org/grpc/picker_wrapper.go | 172 +- vendor/google.golang.org/grpc/pickfirst.go | 89 +- .../grpc/resolver/dns/dns_resolver.go | 36 - .../grpc/resolver/passthrough/passthrough.go | 26 - .../grpc/resolver/resolver.go | 38 +- .../grpc/resolver_conn_wrapper.go | 26 +- vendor/google.golang.org/grpc/rpc_util.go | 3 +- vendor/google.golang.org/grpc/server.go | 148 +- .../google.golang.org/grpc/service_config.go | 4 +- vendor/google.golang.org/grpc/stats/stats.go | 11 + vendor/google.golang.org/grpc/trace.go | 3 - vendor/google.golang.org/grpc/version.go | 2 +- vendor/google.golang.org/grpc/vet.sh | 79 +- vendor/gopkg.in/hjson/hjson-go.v3/LICENSE | 21 - vendor/gopkg.in/hjson/hjson-go.v3/README.md | 181 - .../hjson/hjson-go.v3/build_release.sh | 58 - vendor/gopkg.in/hjson/hjson-go.v3/decode.go | 480 - vendor/gopkg.in/hjson/hjson-go.v3/encode.go | 470 - .../gopkg.in/hjson/hjson-go.v3/parseNumber.go | 108 - .../gopkg.in/jcmturner/aescts.v1/.gitignore | 14 + .../gopkg.in/jcmturner/dnsutils.v1/.gitignore | 14 + .../jcmturner/dnsutils.v1/.travis.yml | 24 + vendor/gopkg.in/mgo.v2/.travis.yml | 45 + vendor/gopkg.in/yaml.v2/.travis.yml | 16 + vendor/gopkg.in/yaml.v2/decode.go | 48 +- vendor/gopkg.in/yaml.v2/encode.go | 28 + vendor/gopkg.in/yaml.v2/resolve.go | 2 +- vendor/gopkg.in/yaml.v2/scannerc.go | 92 +- vendor/gopkg.in/yaml.v2/yaml.go | 2 +- vendor/honnef.co/go/tools/LICENSE | 20 + vendor/honnef.co/go/tools/LICENSE-THIRD-PARTY | 226 + vendor/honnef.co/go/tools/arg/arg.go | 48 + .../go/tools/cmd/staticcheck/README.md | 15 + .../go/tools/cmd/staticcheck/staticcheck.go | 44 + vendor/honnef.co/go/tools/config/config.go | 224 + vendor/honnef.co/go/tools/config/example.conf | 10 + .../honnef.co/go/tools/deprecated/stdlib.go | 112 + vendor/honnef.co/go/tools/facts/deprecated.go | 144 + vendor/honnef.co/go/tools/facts/generated.go | 86 + vendor/honnef.co/go/tools/facts/purity.go | 175 + vendor/honnef.co/go/tools/facts/token.go | 24 + vendor/honnef.co/go/tools/functions/loops.go | 54 + vendor/honnef.co/go/tools/functions/pure.go | 46 + .../go/tools/functions/terminates.go | 24 + .../go/tools/go/types/typeutil/callee.go | 46 + .../go/tools/go/types/typeutil/identical.go | 75 + .../go/tools/go/types/typeutil/imports.go | 31 + .../go/tools/go/types/typeutil/map.go | 319 + .../tools/go/types/typeutil/methodsetcache.go | 72 + .../go/tools/go/types/typeutil/ui.go | 52 + .../go/tools/internal/cache/cache.go | 474 + .../go/tools/internal/cache/default.go | 85 + .../honnef.co/go/tools/internal/cache/hash.go | 176 + .../internal/passes/buildssa/buildssa.go | 116 + .../go/tools/internal/renameio/renameio.go | 83 + .../go/tools/internal/sharedcheck/lint.go | 70 + vendor/honnef.co/go/tools/lint/LICENSE | 28 + vendor/honnef.co/go/tools/lint/lint.go | 491 + .../go/tools/lint/lintdsl/lintdsl.go | 400 + .../go/tools/lint/lintutil/format/format.go | 135 + .../honnef.co/go/tools/lint/lintutil/stats.go | 7 + .../go/tools/lint/lintutil/stats_bsd.go | 10 + .../go/tools/lint/lintutil/stats_posix.go | 10 + .../honnef.co/go/tools/lint/lintutil/util.go | 392 + vendor/honnef.co/go/tools/lint/runner.go | 970 + vendor/honnef.co/go/tools/lint/stats.go | 20 + vendor/honnef.co/go/tools/loader/loader.go | 197 + vendor/honnef.co/go/tools/printf/fuzz.go | 11 + vendor/honnef.co/go/tools/printf/printf.go | 197 + .../honnef.co/go/tools/simple/CONTRIBUTING.md | 15 + vendor/honnef.co/go/tools/simple/analysis.go | 223 + vendor/honnef.co/go/tools/simple/doc.go | 425 + vendor/honnef.co/go/tools/simple/lint.go | 1816 ++ vendor/honnef.co/go/tools/ssa/LICENSE | 28 + vendor/honnef.co/go/tools/ssa/blockopt.go | 195 + vendor/honnef.co/go/tools/ssa/builder.go | 2379 ++ vendor/honnef.co/go/tools/ssa/const.go | 169 + vendor/honnef.co/go/tools/ssa/create.go | 270 + vendor/honnef.co/go/tools/ssa/doc.go | 125 + vendor/honnef.co/go/tools/ssa/dom.go | 343 + vendor/honnef.co/go/tools/ssa/emit.go | 469 + vendor/honnef.co/go/tools/ssa/func.go | 765 + vendor/honnef.co/go/tools/ssa/identical.go | 7 + vendor/honnef.co/go/tools/ssa/identical_17.go | 7 + vendor/honnef.co/go/tools/ssa/lift.go | 657 + vendor/honnef.co/go/tools/ssa/lvalue.go | 123 + vendor/honnef.co/go/tools/ssa/methods.go | 239 + vendor/honnef.co/go/tools/ssa/mode.go | 100 + vendor/honnef.co/go/tools/ssa/print.go | 435 + vendor/honnef.co/go/tools/ssa/sanity.go | 535 + vendor/honnef.co/go/tools/ssa/source.go | 293 + vendor/honnef.co/go/tools/ssa/ssa.go | 1745 ++ .../honnef.co/go/tools/ssa/staticcheck.conf | 3 + vendor/honnef.co/go/tools/ssa/testmain.go | 271 + vendor/honnef.co/go/tools/ssa/util.go | 119 + vendor/honnef.co/go/tools/ssa/wrappers.go | 290 + vendor/honnef.co/go/tools/ssa/write.go | 5 + vendor/honnef.co/go/tools/ssautil/ssautil.go | 58 + .../go/tools/staticcheck/CONTRIBUTING.md | 15 + .../go/tools/staticcheck/analysis.go | 525 + .../go/tools/staticcheck/buildtag.go | 21 + vendor/honnef.co/go/tools/staticcheck/doc.go | 764 + .../go/tools/staticcheck/knowledge.go | 25 + vendor/honnef.co/go/tools/staticcheck/lint.go | 3360 +++ .../honnef.co/go/tools/staticcheck/rules.go | 321 + .../go/tools/staticcheck/structtag.go | 58 + .../go/tools/staticcheck/vrp/channel.go | 73 + .../honnef.co/go/tools/staticcheck/vrp/int.go | 476 + .../go/tools/staticcheck/vrp/slice.go | 273 + .../go/tools/staticcheck/vrp/string.go | 258 + .../honnef.co/go/tools/staticcheck/vrp/vrp.go | 1056 + .../honnef.co/go/tools/stylecheck/analysis.go | 111 + vendor/honnef.co/go/tools/stylecheck/doc.go | 154 + vendor/honnef.co/go/tools/stylecheck/lint.go | 629 + vendor/honnef.co/go/tools/stylecheck/names.go | 264 + vendor/honnef.co/go/tools/unused/edge.go | 54 + .../go/tools/unused/edgekind_string.go | 109 + .../honnef.co/go/tools/unused/implements.go | 82 + vendor/honnef.co/go/tools/unused/unused.go | 1964 ++ .../honnef.co/go/tools/version/buildinfo.go | 46 + .../go/tools/version/buildinfo111.go | 6 + vendor/honnef.co/go/tools/version/version.go | 42 + vendor/howett.net/plist/.gitlab-ci.yml | 39 + vendor/howett.net/plist/README.md | 2 +- vendor/howett.net/plist/bplist_generator.go | 19 +- vendor/howett.net/plist/bplist_parser.go | 31 +- vendor/howett.net/plist/go.mod | 9 + vendor/howett.net/plist/unmarshal.go | 5 +- vendor/howett.net/plist/xml_generator.go | 212 +- .../client-go/pkg/version/.gitattributes | 1 + vendor/k8s.io/client-go/tools/cache/store.go | 0 vendor/k8s.io/klog/.travis.yml | 15 + vendor/modules.txt | 1232 + vendor/pack.ag/amqp/CONTRIBUTING.md | 56 - vendor/pack.ag/amqp/LICENSE | 21 - vendor/pack.ag/amqp/Makefile | 31 - vendor/pack.ag/amqp/README.md | 131 - vendor/pack.ag/amqp/bitmap.go | 92 - vendor/pack.ag/amqp/buffer.go | 167 - vendor/pack.ag/amqp/client.go | 2121 -- vendor/pack.ag/amqp/conn.go | 924 - vendor/pack.ag/amqp/decode.go | 1254 - vendor/pack.ag/amqp/doc.go | 10 - vendor/pack.ag/amqp/encode.go | 595 - vendor/pack.ag/amqp/error_pkgerrors.go | 12 - vendor/pack.ag/amqp/error_stdlib.go | 15 - vendor/pack.ag/amqp/fuzz.go | 191 - .../amqp/internal/testconn/recorder.go | 31 - .../amqp/internal/testconn/testconn.go | 88 - vendor/pack.ag/amqp/log.go | 7 - vendor/pack.ag/amqp/log_debug.go | 27 - vendor/pack.ag/amqp/sasl.go | 94 - vendor/pack.ag/amqp/types.go | 4123 --- vendor/sigs.k8s.io/yaml/.gitignore | 20 + vendor/sigs.k8s.io/yaml/.travis.yml | 12 + vendor/vendor.json | 7813 ------ winlogbeat/beater/acker.go | 4 +- winlogbeat/beater/eventlogger.go | 18 +- winlogbeat/beater/eventlogger_test.go | 4 +- winlogbeat/beater/winlogbeat.go | 16 +- winlogbeat/checkpoint/checkpoint.go | 2 +- winlogbeat/cmd/root.go | 14 +- winlogbeat/config/config.go | 2 +- winlogbeat/config/config_test.go | 2 +- winlogbeat/eventlog/cache.go | 6 +- winlogbeat/eventlog/common_test.go | 4 +- winlogbeat/eventlog/eventlog.go | 10 +- winlogbeat/eventlog/eventlogging.go | 10 +- winlogbeat/eventlog/eventlogging_test.go | 6 +- winlogbeat/eventlog/factory.go | 2 +- winlogbeat/eventlog/wineventlog.go | 10 +- winlogbeat/include/fields.go | 2 +- winlogbeat/magefile.go | 18 +- winlogbeat/main.go | 2 +- winlogbeat/main_test.go | 4 +- winlogbeat/scripts/mage/config.go | 2 +- winlogbeat/scripts/mage/docs.go | 2 +- winlogbeat/scripts/mage/fields.go | 2 +- winlogbeat/scripts/mage/package.go | 6 +- winlogbeat/scripts/mage/update.go | 10 +- .../sys/eventlogging/eventlogging_windows.go | 11 +- .../sys/eventlogging/stringinserts_windows.go | 2 +- .../sys/wineventlog/wineventlog_windows.go | 2 +- x-pack/auditbeat/cache/cache_test.go | 2 +- x-pack/auditbeat/cmd/root.go | 6 +- x-pack/auditbeat/include/list.go | 14 +- x-pack/auditbeat/magefile.go | 10 +- x-pack/auditbeat/main.go | 8 +- x-pack/auditbeat/main_test.go | 4 +- x-pack/auditbeat/module/system/fields.go | 2 +- x-pack/auditbeat/module/system/host/host.go | 12 +- .../auditbeat/module/system/host/host_test.go | 6 +- x-pack/auditbeat/module/system/login/login.go | 10 +- .../module/system/login/login_other.go | 2 +- .../module/system/login/login_test.go | 8 +- x-pack/auditbeat/module/system/login/utmp.go | 4 +- .../module/system/package/package.go | 16 +- .../system/package/package_homebrew_test.go | 8 +- .../module/system/package/package_test.go | 8 +- .../module/system/package/package_windows.go | 2 +- .../auditbeat/module/system/process/config.go | 2 +- .../module/system/process/process.go | 18 +- .../module/system/process/process_test.go | 10 +- .../module/system/socket/arch_386.go | 2 +- .../module/system/socket/arch_amd64.go | 2 +- .../system/socket/dns/afpacket/afpacket.go | 6 +- .../auditbeat/module/system/socket/dns/dns.go | 4 +- .../module/system/socket/dns/registry.go | 4 +- .../auditbeat/module/system/socket/events.go | 2 +- .../module/system/socket/guess/creds.go | 6 +- .../module/system/socket/guess/cskxmit6.go | 6 +- .../module/system/socket/guess/deref.go | 6 +- .../module/system/socket/guess/guess.go | 6 +- .../module/system/socket/guess/helpers.go | 2 +- .../module/system/socket/guess/inetsock.go | 6 +- .../module/system/socket/guess/inetsock6.go | 6 +- .../module/system/socket/guess/inetsockaf.go | 6 +- .../module/system/socket/guess/iplocalout.go | 6 +- .../module/system/socket/guess/skbuff.go | 6 +- .../module/system/socket/guess/sockaddrin.go | 6 +- .../module/system/socket/guess/sockaddrin6.go | 6 +- .../module/system/socket/guess/socketsk.go | 6 +- .../module/system/socket/guess/syscallargs.go | 6 +- .../system/socket/guess/tcpsendmsgargs.go | 6 +- .../system/socket/guess/tcpsendmsgsk.go | 6 +- .../module/system/socket/guess/udpsendmsg.go | 6 +- .../module/system/socket/helper/probes.go | 4 +- .../module/system/socket/helper/types.go | 2 +- .../auditbeat/module/system/socket/kprobes.go | 6 +- .../module/system/socket/kprobes_test.go | 6 +- .../module/system/socket/socket_linux.go | 20 +- .../module/system/socket/socket_other.go | 2 +- .../auditbeat/module/system/socket/state.go | 12 +- .../module/system/socket/state_test.go | 6 +- .../module/system/socket/template.go | 4 +- x-pack/auditbeat/module/system/system.go | 4 +- x-pack/auditbeat/module/system/user/user.go | 16 +- .../auditbeat/module/system/user/user_test.go | 6 +- .../module/system/user/users_other.go | 2 +- x-pack/auditbeat/seccomp_linux.go | 2 +- x-pack/dockerlogbeat/handlers.go | 2 +- x-pack/dockerlogbeat/magefile.go | 10 +- x-pack/dockerlogbeat/main.go | 24 +- .../pipelinemanager/clientLogReader.go | 10 +- .../pipelinemanager/clientLogReader_test.go | 8 +- .../pipelinemanager/libbeattools.go | 20 +- .../pipelinemanager/pipelineManager.go | 8 +- .../dockerlogbeat/pipelinemock/pipelines.go | 2 +- .../dockerlogbeat/pipereader/reader_test.go | 2 +- x-pack/filebeat/cmd/root.go | 6 +- x-pack/filebeat/include/list.go | 48 +- .../azureeventhub_integration_test.go | 8 +- x-pack/filebeat/input/azureeventhub/input.go | 12 +- .../input/azureeventhub/input_test.go | 6 +- x-pack/filebeat/input/cloudfoundry/input.go | 16 +- x-pack/filebeat/input/googlepubsub/input.go | 14 +- .../input/googlepubsub/pubsub_test.go | 16 +- x-pack/filebeat/input/httpjson/config.go | 4 +- .../filebeat/input/httpjson/httpjson_test.go | 10 +- x-pack/filebeat/input/httpjson/input.go | 16 +- x-pack/filebeat/input/netflow/case.go | 4 +- x-pack/filebeat/input/netflow/config.go | 4 +- x-pack/filebeat/input/netflow/convert.go | 10 +- .../input/netflow/decoder/config/config.go | 2 +- .../filebeat/input/netflow/decoder/decoder.go | 6 +- .../decoder/examples/go-netflow-example.go | 2 +- .../filebeat/input/netflow/decoder/include.go | 14 +- .../input/netflow/decoder/ipfix/decoder.go | 6 +- .../netflow/decoder/ipfix/decoder_test.go | 8 +- .../input/netflow/decoder/ipfix/ipfix.go | 6 +- .../input/netflow/decoder/ipfix/ipfix_test.go | 10 +- .../netflow/decoder/protocol/protocol.go | 2 +- .../netflow/decoder/protocol/registry.go | 2 +- .../netflow/decoder/protocol/registry_test.go | 4 +- .../netflow/decoder/template/template.go | 4 +- .../netflow/decoder/template/template_test.go | 6 +- .../netflow/decoder/template/test_helpers.go | 2 +- .../input/netflow/decoder/test/helper.go | 2 +- .../filebeat/input/netflow/decoder/v1/v1.go | 10 +- .../input/netflow/decoder/v1/v1_test.go | 8 +- .../filebeat/input/netflow/decoder/v5/v5.go | 12 +- .../input/netflow/decoder/v5/v5_test.go | 8 +- .../filebeat/input/netflow/decoder/v6/v6.go | 12 +- .../input/netflow/decoder/v6/v6_test.go | 8 +- .../filebeat/input/netflow/decoder/v7/v7.go | 12 +- .../input/netflow/decoder/v7/v7_test.go | 8 +- .../filebeat/input/netflow/decoder/v8/v8.go | 10 +- .../input/netflow/decoder/v8/v8_test.go | 8 +- .../input/netflow/decoder/v9/decoder.go | 6 +- .../input/netflow/decoder/v9/decoder_test.go | 6 +- .../input/netflow/decoder/v9/session.go | 4 +- .../input/netflow/decoder/v9/session_test.go | 4 +- .../filebeat/input/netflow/decoder/v9/v9.go | 6 +- .../input/netflow/decoder/v9/v9_test.go | 6 +- x-pack/filebeat/input/netflow/definitions.go | 2 +- .../input/netflow/definitions_test.go | 2 +- x-pack/filebeat/input/netflow/fields.go | 2 +- x-pack/filebeat/input/netflow/fields_gen.go | 2 +- x-pack/filebeat/input/netflow/input.go | 24 +- x-pack/filebeat/input/netflow/netflow_test.go | 10 +- x-pack/filebeat/input/s3/config.go | 4 +- x-pack/filebeat/input/s3/fields.go | 2 +- x-pack/filebeat/input/s3/input.go | 14 +- x-pack/filebeat/input/s3/input_test.go | 2 +- .../filebeat/input/s3/s3_integration_test.go | 12 +- x-pack/filebeat/magefile.go | 8 +- x-pack/filebeat/main.go | 2 +- x-pack/filebeat/main_test.go | 4 +- x-pack/filebeat/module/activemq/fields.go | 2 +- x-pack/filebeat/module/aws/fields.go | 2 +- x-pack/filebeat/module/azure/fields.go | 2 +- x-pack/filebeat/module/cef/fields.go | 2 +- x-pack/filebeat/module/cisco/fields.go | 2 +- .../module/cisco/ios/pipeline_test.go | 16 +- x-pack/filebeat/module/coredns/fields.go | 2 +- x-pack/filebeat/module/envoyproxy/fields.go | 2 +- x-pack/filebeat/module/googlecloud/fields.go | 2 +- x-pack/filebeat/module/ibmmq/fields.go | 2 +- x-pack/filebeat/module/iptables/fields.go | 2 +- x-pack/filebeat/module/misp/fields.go | 2 +- x-pack/filebeat/module/mssql/fields.go | 2 +- x-pack/filebeat/module/netflow/fields.go | 2 +- x-pack/filebeat/module/panw/fields.go | 2 +- x-pack/filebeat/module/rabbitmq/fields.go | 2 +- x-pack/filebeat/module/suricata/fields.go | 2 +- x-pack/filebeat/module/zeek/fields.go | 2 +- .../filebeat/processors/decode_cef/cef/cef.go | 2 +- .../decode_cef/cef/cmd/cef2json/cef2json.go | 2 +- .../processors/decode_cef/cef/fuzz/fuzz.go | 2 +- .../processors/decode_cef/cef/types.go | 2 +- .../processors/decode_cef/decode_cef.go | 12 +- .../processors/decode_cef/decode_cef_test.go | 4 +- .../filebeat/processors/decode_cef/fields.go | 2 +- .../processors/decode_cef/keys.ecs.go | 2 +- x-pack/functionbeat/config/config.go | 4 +- x-pack/functionbeat/config/config_test.go | 2 +- .../function/beater/functionbeat.go | 24 +- .../function/beater/proccessors_test.go | 8 +- .../function/beater/processors.go | 8 +- x-pack/functionbeat/function/cmd/root.go | 10 +- .../functionbeat/function/core/coordinator.go | 4 +- .../function/core/coordinator_test.go | 2 +- .../functionbeat/function/core/sync_client.go | 4 +- .../function/core/sync_client_test.go | 2 +- x-pack/functionbeat/function/provider/cli.go | 4 +- .../function/provider/default_provider.go | 8 +- .../functionbeat/function/provider/feature.go | 2 +- .../function/provider/feature_test.go | 6 +- .../function/provider/provider.go | 10 +- .../function/provider/provider_test.go | 8 +- .../function/provider/registry.go | 10 +- .../function/provider/registry_test.go | 10 +- .../function/provider/template.go | 4 +- .../function/telemetry/telemetry.go | 2 +- x-pack/functionbeat/include/feature.go | 8 +- x-pack/functionbeat/include/fields.go | 2 +- x-pack/functionbeat/magefile.go | 14 +- x-pack/functionbeat/main.go | 4 +- x-pack/functionbeat/main_test.go | 4 +- x-pack/functionbeat/manager/aws/aws.go | 6 +- .../functionbeat/manager/aws/cli_manager.go | 12 +- .../manager/aws/cli_manager_test.go | 2 +- .../manager/aws/event_stack_poller.go | 2 +- .../manager/aws/event_stack_poller_test.go | 2 +- .../manager/aws/op_cloudformation.go | 4 +- .../manager/aws/op_cloudformation_test.go | 2 +- .../manager/aws/op_delete_cloudformation.go | 4 +- .../manager/aws/op_delete_file_bucket.go | 4 +- .../manager/aws/op_ensure_bucket.go | 4 +- .../manager/aws/op_update_cloudformation.go | 4 +- .../manager/aws/op_upload_to_bucket.go | 4 +- .../manager/aws/op_wait_cloud_formation.go | 4 +- .../functionbeat/manager/aws/policies_test.go | 6 +- .../manager/aws/template_builder.go | 12 +- .../manager/beater/functionbeat.go | 8 +- .../functionbeat/manager/cmd/cli_handler.go | 4 +- .../manager/cmd/cli_handler_test.go | 2 +- .../functionbeat/manager/cmd/provider_cmd.go | 8 +- x-pack/functionbeat/manager/cmd/root.go | 8 +- .../manager/core/bundle/bundle_test.go | 2 +- x-pack/functionbeat/manager/core/makezip.go | 10 +- .../functionbeat/manager/executor/executor.go | 2 +- .../functionbeat/manager/gcp/cli_manager.go | 12 +- x-pack/functionbeat/manager/gcp/gcp.go | 6 +- .../manager/gcp/op_create_function.go | 4 +- .../manager/gcp/op_delete_file_bucket.go | 4 +- .../manager/gcp/op_delete_function.go | 4 +- .../manager/gcp/op_ensure_bucket.go | 4 +- .../manager/gcp/op_update_function.go | 4 +- .../manager/gcp/op_upload_to_bucket.go | 4 +- .../manager/gcp/op_wait_for_function.go | 4 +- .../manager/gcp/template_builder.go | 12 +- .../provider/aws/aws/api_gateway_proxy.go | 16 +- .../aws/aws/api_gateway_proxy_test.go | 4 +- .../provider/aws/aws/cloudwatch_kinesis.go | 14 +- .../provider/aws/aws/cloudwatch_logs.go | 14 +- .../provider/aws/aws/cloudwatch_logs_test.go | 6 +- .../functionbeat/provider/aws/aws/config.go | 2 +- .../functionbeat/provider/aws/aws/kinesis.go | 14 +- .../provider/aws/aws/kinesis_test.go | 4 +- x-pack/functionbeat/provider/aws/aws/sqs.go | 14 +- .../functionbeat/provider/aws/aws/sqs_test.go | 4 +- .../aws/aws/transformer/transformer.go | 4 +- .../aws/aws/transformer/transformer_test.go | 4 +- x-pack/functionbeat/provider/aws/cmd/root.go | 4 +- .../provider/aws/include/feature.go | 6 +- x-pack/functionbeat/provider/aws/main.go | 4 +- x-pack/functionbeat/provider/aws/main_test.go | 2 +- .../functionbeat/provider/gcp/gcp/pubsub.go | 12 +- .../functionbeat/provider/gcp/gcp/storage.go | 12 +- .../provider/gcp/gcp/transformer.go | 4 +- .../provider/gcp/include/feature.go | 6 +- .../provider/gcp/pubsub/pubsub.go | 18 +- .../provider/gcp/storage/storage.go | 18 +- .../functionbeat/provider/local/cmd/root.go | 4 +- .../provider/local/include/feature.go | 4 +- .../provider/local/local/local.go | 12 +- x-pack/functionbeat/provider/local/main.go | 4 +- .../functionbeat/provider/local/main_test.go | 2 +- x-pack/functionbeat/scripts/mage/config.go | 2 +- x-pack/functionbeat/scripts/mage/update.go | 17 +- x-pack/heartbeat/cmd/root.go | 4 +- x-pack/heartbeat/main.go | 4 +- x-pack/heartbeat/main_test.go | 4 +- x-pack/journalbeat/cmd/root.go | 4 +- x-pack/journalbeat/main.go | 4 +- x-pack/journalbeat/main_test.go | 4 +- .../autodiscover/providers/aws/config.go | 4 +- .../autodiscover/providers/aws/ec2/ec2.go | 6 +- .../autodiscover/providers/aws/ec2/fetch.go | 4 +- .../providers/aws/ec2/provider.go | 16 +- .../providers/aws/ec2/provider_test.go | 12 +- .../autodiscover/providers/aws/ec2/watch.go | 4 +- .../autodiscover/providers/aws/elb/fetch.go | 2 +- .../providers/aws/elb/lblistener.go | 4 +- .../providers/aws/elb/provider.go | 16 +- .../providers/aws/elb/provider_test.go | 8 +- .../autodiscover/providers/aws/elb/watch.go | 2 +- .../providers/aws/test/provider.go | 2 +- x-pack/libbeat/cmd/enroll.go | 10 +- x-pack/libbeat/cmd/inject.go | 12 +- x-pack/libbeat/common/cloudfoundry/cache.go | 4 +- .../libbeat/common/cloudfoundry/cache_test.go | 2 +- x-pack/libbeat/common/cloudfoundry/config.go | 2 +- .../common/cloudfoundry/config_test.go | 2 +- x-pack/libbeat/common/cloudfoundry/doer.go | 2 +- x-pack/libbeat/common/cloudfoundry/events.go | 2 +- x-pack/libbeat/common/cloudfoundry/hub.go | 2 +- .../common/cloudfoundry/rlplistener.go | 2 +- x-pack/libbeat/libbeat.go | 6 +- x-pack/libbeat/libbeat_test.go | 2 +- x-pack/libbeat/licenser/check.go | 2 +- x-pack/libbeat/licenser/check_test.go | 2 +- x-pack/libbeat/licenser/elastic_fetcher.go | 4 +- .../elastic_fetcher_integration_test.go | 6 +- .../libbeat/licenser/elastic_fetcher_test.go | 2 +- x-pack/libbeat/licenser/es_callback.go | 4 +- x-pack/libbeat/magefile.go | 8 +- x-pack/libbeat/management/api/client.go | 4 +- x-pack/libbeat/management/api/client_test.go | 2 +- .../libbeat/management/api/configuration.go | 4 +- x-pack/libbeat/management/api/enroll.go | 2 +- .../libbeat/management/api/event_reporter.go | 2 +- .../management/api/event_reporter_test.go | 2 +- x-pack/libbeat/management/blacklist.go | 6 +- x-pack/libbeat/management/blacklist_test.go | 4 +- x-pack/libbeat/management/cache.go | 8 +- x-pack/libbeat/management/cache_test.go | 2 +- x-pack/libbeat/management/config.go | 2 +- x-pack/libbeat/management/enroll.go | 12 +- x-pack/libbeat/management/error.go | 2 +- x-pack/libbeat/management/error_test.go | 2 +- x-pack/libbeat/management/manager.go | 14 +- x-pack/libbeat/management/manager_test.go | 8 +- x-pack/libbeat/management/state.go | 2 +- .../add_cloudfoundry_metadata.go | 11 +- .../add_cloudfoundry_metadata_test.go | 6 +- x-pack/metricbeat/cmd/root.go | 18 +- x-pack/metricbeat/include/list.go | 86 +- x-pack/metricbeat/magefile.go | 8 +- x-pack/metricbeat/main.go | 2 +- x-pack/metricbeat/main_test.go | 4 +- x-pack/metricbeat/module/activemq/fields.go | 2 +- x-pack/metricbeat/module/appsearch/fields.go | 2 +- .../metricbeat/module/appsearch/stats/data.go | 6 +- .../module/appsearch/stats/stats.go | 6 +- .../appsearch/stats/stats_integration_test.go | 4 +- x-pack/metricbeat/module/aws/aws.go | 6 +- .../aws/billing/billing_integration_test.go | 4 +- .../module/aws/billing/billing_test.go | 6 +- .../module/aws/cloudwatch/cloudwatch.go | 8 +- .../cloudwatch/cloudwatch_integration_test.go | 4 +- .../module/aws/cloudwatch/cloudwatch_test.go | 2 +- .../aws/dynamodb/dynamodb_integration_test.go | 4 +- .../module/aws/dynamodb/dynamodb_test.go | 6 +- .../module/aws/ebs/ebs_integration_test.go | 4 +- x-pack/metricbeat/module/aws/ebs/ebs_test.go | 6 +- x-pack/metricbeat/module/aws/ec2/data.go | 4 +- x-pack/metricbeat/module/aws/ec2/ec2.go | 8 +- .../module/aws/ec2/ec2_integration_test.go | 4 +- x-pack/metricbeat/module/aws/ec2/ec2_test.go | 6 +- .../module/aws/elb/elb_integration_test.go | 6 +- x-pack/metricbeat/module/aws/elb/elb_test.go | 6 +- x-pack/metricbeat/module/aws/fields.go | 2 +- .../aws/lambda/lambda_integration_test.go | 4 +- .../module/aws/lambda/lambda_test.go | 6 +- .../module/aws/mtest/integration.go | 2 +- x-pack/metricbeat/module/aws/rds/data.go | 4 +- x-pack/metricbeat/module/aws/rds/rds.go | 6 +- .../module/aws/rds/rds_integration_test.go | 4 +- .../module/aws/s3_daily_storage/data.go | 4 +- .../aws/s3_daily_storage/s3_daily_storage.go | 6 +- .../s3_daily_storage_integration_test.go | 4 +- .../metricbeat/module/aws/s3_request/data.go | 4 +- .../module/aws/s3_request/s3_request.go | 6 +- .../s3_request/s3_request_integration_test.go | 4 +- .../module/aws/sns/sns_integration_test.go | 4 +- x-pack/metricbeat/module/aws/sns/sns_test.go | 6 +- x-pack/metricbeat/module/aws/sqs/data.go | 4 +- x-pack/metricbeat/module/aws/sqs/sqs.go | 8 +- .../module/aws/sqs/sqs_integration_test.go | 4 +- .../aws/usage/usage_integration_test.go | 4 +- .../metricbeat/module/aws/usage/usage_test.go | 6 +- x-pack/metricbeat/module/aws/utils.go | 4 +- .../module/aws/vpc/vpc_integration_test.go | 6 +- x-pack/metricbeat/module/aws/vpc/vpc_test.go | 6 +- x-pack/metricbeat/module/azure/azure.go | 4 +- x-pack/metricbeat/module/azure/client.go | 4 +- .../module/azure/compute_vm/client_helper.go | 2 +- .../azure/compute_vm/client_helper_test.go | 2 +- .../module/azure/compute_vm/compute_vm.go | 4 +- .../azure/compute_vm/compute_vm_test.go | 4 +- .../compute_vm_scaleset/client_helper.go | 2 +- .../compute_vm_scaleset/client_helper_test.go | 2 +- .../compute_vm_scaleset.go | 4 +- .../compute_vm_scaleset_test.go | 4 +- x-pack/metricbeat/module/azure/data.go | 4 +- .../database_account_integration_test.go | 2 +- .../database_account/database_account_test.go | 2 +- x-pack/metricbeat/module/azure/fields.go | 2 +- .../metricbeat/module/azure/mock_service.go | 4 +- .../module/azure/monitor/client_helper.go | 2 +- .../azure/monitor/client_helper_test.go | 2 +- .../module/azure/monitor/monitor.go | 4 +- .../module/azure/monitor/monitor_test.go | 4 +- .../module/azure/monitor_service.go | 2 +- .../module/azure/storage/client_helper.go | 2 +- .../azure/storage/client_helper_test.go | 2 +- .../module/azure/storage/storage.go | 4 +- .../module/azure/storage/storage_test.go | 4 +- .../metricbeat/module/cockroachdb/fields.go | 2 +- .../status/status_integration_test.go | 10 +- .../module/cockroachdb/status/status_test.go | 10 +- x-pack/metricbeat/module/coredns/fields.go | 2 +- .../metricbeat/module/coredns/stats/stats.go | 4 +- .../coredns/stats/stats_integration_test.go | 4 +- .../module/coredns/stats/stats_test.go | 4 +- .../metricbeat/module/googlecloud/fields.go | 2 +- .../metricbeat/module/googlecloud/metadata.go | 2 +- .../stackdriver/compute/identity.go | 2 +- .../stackdriver/compute/metadata.go | 4 +- .../stackdriver/metadata_services.go | 4 +- .../stackdriver/metrics_requester.go | 4 +- .../stackdriver/metrics_requester_test.go | 2 +- .../googlecloud/stackdriver/metricset.go | 8 +- .../stackdriver/response_parser.go | 4 +- .../googlecloud/stackdriver/timeseries.go | 2 +- .../timeseries_metadata_collector.go | 2 +- x-pack/metricbeat/module/ibmmq/fields.go | 2 +- .../ibmmq/qmgr/qmgr_integration_test.go | 10 +- .../metricbeat/module/ibmmq/qmgr/qmgr_test.go | 10 +- .../module/istio/citadel/citadel.go | 6 +- .../module/istio/citadel/citadel_test.go | 4 +- x-pack/metricbeat/module/istio/fields.go | 2 +- .../metricbeat/module/istio/galley/galley.go | 6 +- .../module/istio/galley/galley_test.go | 4 +- x-pack/metricbeat/module/istio/mesh/mesh.go | 6 +- .../metricbeat/module/istio/mesh/mesh_test.go | 4 +- x-pack/metricbeat/module/istio/mixer/mixer.go | 6 +- .../module/istio/mixer/mixer_test.go | 4 +- x-pack/metricbeat/module/istio/pilot/pilot.go | 6 +- .../module/istio/pilot/pilot_test.go | 4 +- x-pack/metricbeat/module/mssql/fields.go | 2 +- x-pack/metricbeat/module/mssql/mssql.go | 4 +- .../module/mssql/performance/data.go | 4 +- .../performance/data_integration_test.go | 4 +- .../module/mssql/performance/performance.go | 10 +- .../performance_integration_test.go | 8 +- .../transaction_log/data_integration_test.go | 4 +- .../mssql/transaction_log/transaction_log.go | 10 +- .../transaction_log_integration_test.go | 8 +- x-pack/metricbeat/module/oracle/connection.go | 4 +- x-pack/metricbeat/module/oracle/fields.go | 2 +- .../performance/buffer_cache_hit_ratio.go | 4 +- .../module/oracle/performance/cursors.go | 4 +- .../module/oracle/performance/data.go | 2 +- .../oracle/performance/library_cache.go | 4 +- .../module/oracle/performance/metricset.go | 6 +- .../oracle/performance/metricset_test.go | 6 +- x-pack/metricbeat/module/oracle/sql.go | 4 +- .../module/oracle/tablespace/data.go | 6 +- .../module/oracle/tablespace/metricset.go | 6 +- .../oracle/tablespace/metricset_test.go | 6 +- x-pack/metricbeat/module/sql/fields.go | 2 +- x-pack/metricbeat/module/sql/query/dsn.go | 2 +- x-pack/metricbeat/module/sql/query/query.go | 6 +- .../sql/query/query_integration_test.go | 12 +- .../module/stan/channels/channels.go | 8 +- .../channels/channels_integration_test.go | 4 +- .../module/stan/channels/channels_test.go | 2 +- .../metricbeat/module/stan/channels/data.go | 6 +- x-pack/metricbeat/module/stan/fields.go | 2 +- x-pack/metricbeat/module/stan/stats/data.go | 6 +- x-pack/metricbeat/module/stan/stats/stats.go | 8 +- .../stan/stats/stats_integration_test.go | 4 +- .../module/stan/stats/stats_test.go | 2 +- .../module/stan/subscriptions/data.go | 6 +- .../stan/subscriptions/subscriptions.go | 8 +- .../subscriptions_integration_test.go | 4 +- .../stan/subscriptions/subscriptions_test.go | 2 +- x-pack/metricbeat/module/statsd/fields.go | 2 +- .../metricbeat/module/statsd/server/data.go | 4 +- .../module/statsd/server/data_test.go | 6 +- .../module/statsd/server/registry.go | 4 +- .../metricbeat/module/statsd/server/server.go | 8 +- x-pack/metricbeat/module/tomcat/fields.go | 2 +- x-pack/metricbeat/scripts/msetlists/main.go | 8 +- x-pack/packetbeat/cmd/root.go | 4 +- x-pack/packetbeat/main.go | 2 +- x-pack/packetbeat/main_test.go | 4 +- x-pack/winlogbeat/cmd/root.go | 4 +- x-pack/winlogbeat/include/list.go | 4 +- x-pack/winlogbeat/magefile.go | 16 +- x-pack/winlogbeat/main.go | 4 +- x-pack/winlogbeat/main_test.go | 4 +- x-pack/winlogbeat/module/security/fields.go | 2 +- .../security/test/security_windows_test.go | 6 +- x-pack/winlogbeat/module/sysmon/fields.go | 2 +- .../module/sysmon/test/sysmon_windows_test.go | 6 +- x-pack/winlogbeat/module/testing_windows.go | 14 +- 4878 files changed, 281659 insertions(+), 356467 deletions(-) create mode 100644 dev-tools/mage/gomod.go create mode 100644 dev-tools/mage/gotool/modules.go rename generator/{ => _templates}/beat/.gitignore (100%) rename generator/{ => _templates}/beat/CHANGELOG.md (100%) create mode 100644 generator/_templates/beat/Makefile rename generator/{ => _templates}/beat/README.md (100%) rename generator/{ => _templates}/beat/{beat}/.editorconfig (100%) rename generator/{ => _templates}/beat/{beat}/.gitignore (100%) rename generator/{ => _templates}/beat/{beat}/.travis.yml (100%) rename generator/{ => _templates}/beat/{beat}/CONTRIBUTING.md (100%) rename generator/{ => _templates}/beat/{beat}/LICENSE.txt (100%) rename generator/{ => _templates}/beat/{beat}/Makefile (100%) rename generator/{ => _templates}/beat/{beat}/NOTICE.txt (100%) rename generator/{ => _templates}/beat/{beat}/README.md (100%) rename generator/{ => _templates}/beat/{beat}/_meta/beat.docker.yml (100%) rename generator/{ => _templates}/beat/{beat}/_meta/beat.yml (100%) rename generator/{ => _templates}/beat/{beat}/_meta/fields.yml (100%) rename generator/{ => _templates}/beat/{beat}/beater/{beat}.go (89%) create mode 100644 generator/_templates/beat/{beat}/cmd/root.go rename generator/{ => _templates}/beat/{beat}/config/config.go (100%) rename generator/{ => _templates}/beat/{beat}/config/config_test.go (100%) rename generator/{ => _templates}/beat/{beat}/docs/index.asciidoc (100%) create mode 100644 generator/_templates/beat/{beat}/magefile.go rename generator/{ => _templates}/beat/{beat}/main.go (100%) rename generator/{ => _templates}/beat/{beat}/main_test.go (100%) rename generator/{ => _templates}/beat/{beat}/make.bat (100%) rename generator/{ => _templates}/beat/{beat}/tests/system/config/{beat}.yml.j2 (100%) rename generator/{ => _templates}/beat/{beat}/tests/system/requirements.txt (100%) rename generator/{ => _templates}/beat/{beat}/tests/system/test_base.py (100%) rename generator/{ => _templates}/beat/{beat}/tests/system/{beat}.py (100%) rename generator/{ => _templates}/metricbeat/.gitignore (100%) rename generator/{ => _templates}/metricbeat/CHANGELOG.md (100%) rename generator/{ => _templates}/metricbeat/LICENSE (100%) create mode 100644 generator/_templates/metricbeat/Makefile rename generator/{ => _templates}/metricbeat/README.md (100%) rename generator/{ => _templates}/metricbeat/{beat}/.editorconfig (100%) rename generator/{ => _templates}/metricbeat/{beat}/.gitignore (100%) rename generator/{ => _templates}/metricbeat/{beat}/CONTRIBUTING.md (100%) rename generator/{ => _templates}/metricbeat/{beat}/LICENSE.txt (100%) rename generator/{ => _templates}/metricbeat/{beat}/Makefile (100%) rename generator/{ => _templates}/metricbeat/{beat}/NOTICE.txt (100%) rename generator/{ => _templates}/metricbeat/{beat}/README.md (100%) rename generator/{ => _templates}/metricbeat/{beat}/_meta/docker.yml (100%) rename generator/{ => _templates}/metricbeat/{beat}/_meta/reference.yml (100%) rename generator/{ => _templates}/metricbeat/{beat}/_meta/short.yml (100%) create mode 100644 generator/_templates/metricbeat/{beat}/cmd/modules.go create mode 100644 generator/_templates/metricbeat/{beat}/cmd/root.go create mode 100644 generator/_templates/metricbeat/{beat}/magefile.go rename generator/{ => _templates}/metricbeat/{beat}/main.go (100%) rename generator/{ => _templates}/metricbeat/{beat}/make.bat (100%) delete mode 100644 generator/beat/Makefile delete mode 100644 generator/beat/{beat}/cmd/root.go delete mode 100644 generator/beat/{beat}/magefile.go delete mode 100644 generator/metricbeat/Makefile delete mode 100644 generator/metricbeat/{beat}/cmd/modules.go delete mode 100644 generator/metricbeat/{beat}/cmd/root.go delete mode 100644 generator/metricbeat/{beat}/magefile.go create mode 100644 go.mod create mode 100644 go.sum delete mode 100755 script/clean_vendor.sh delete mode 100644 script/update_golang_x.py create mode 100644 tools/tools.go create mode 100644 vendor/4d63.com/embedfiles/LICENSE create mode 100644 vendor/4d63.com/embedfiles/README.md create mode 100644 vendor/4d63.com/embedfiles/main.go create mode 100644 vendor/4d63.com/tz/.gitignore create mode 100644 vendor/4d63.com/tz/tools.go create mode 100644 vendor/cloud.google.com/go/CHANGES.md create mode 100644 vendor/cloud.google.com/go/CODE_OF_CONDUCT.md create mode 100644 vendor/cloud.google.com/go/CONTRIBUTING.md create mode 100644 vendor/cloud.google.com/go/README.md create mode 100644 vendor/cloud.google.com/go/RELEASING.md create mode 100644 vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json rename vendor/{github.com/census-instrumentation/opencensus-proto => cloud.google.com/go/datastore}/LICENSE (100%) create mode 100644 vendor/cloud.google.com/go/datastore/README.md create mode 100644 vendor/cloud.google.com/go/datastore/client.go create mode 100644 vendor/cloud.google.com/go/datastore/datastore.go create mode 100644 vendor/cloud.google.com/go/datastore/datastore.replay create mode 100644 vendor/cloud.google.com/go/datastore/doc.go create mode 100644 vendor/cloud.google.com/go/datastore/errors.go create mode 100644 vendor/cloud.google.com/go/datastore/go.mod create mode 100644 vendor/cloud.google.com/go/datastore/go.sum create mode 100644 vendor/cloud.google.com/go/datastore/go_mod_tidy_hack.go create mode 100644 vendor/cloud.google.com/go/datastore/internal/gaepb/datastore_v3.pb.go create mode 100644 vendor/cloud.google.com/go/datastore/key.go create mode 100644 vendor/cloud.google.com/go/datastore/keycompat.go create mode 100644 vendor/cloud.google.com/go/datastore/load.go create mode 100644 vendor/cloud.google.com/go/datastore/mutation.go create mode 100644 vendor/cloud.google.com/go/datastore/prop.go create mode 100644 vendor/cloud.google.com/go/datastore/query.go create mode 100644 vendor/cloud.google.com/go/datastore/save.go create mode 100644 vendor/cloud.google.com/go/datastore/time.go create mode 100644 vendor/cloud.google.com/go/datastore/transaction.go create mode 100644 vendor/cloud.google.com/go/doc.go create mode 100644 vendor/cloud.google.com/go/functions/metadata/.repo-metadata.json create mode 100644 vendor/cloud.google.com/go/go.mod create mode 100644 vendor/cloud.google.com/go/go.sum create mode 100644 vendor/cloud.google.com/go/iam/.repo-metadata.json create mode 100644 vendor/cloud.google.com/go/internal/fields/fields.go create mode 100644 vendor/cloud.google.com/go/internal/fields/fold.go mode change 100755 => 100644 vendor/cloud.google.com/go/internal/version/update_version.sh create mode 100644 vendor/cloud.google.com/go/issue_template.md create mode 100644 vendor/cloud.google.com/go/monitoring/apiv3/.repo-metadata.json create mode 100644 vendor/cloud.google.com/go/pubsub/CHANGES.md rename vendor/{github.com/coreos/etcd => cloud.google.com/go/pubsub}/LICENSE (100%) create mode 100644 vendor/cloud.google.com/go/pubsub/README.md create mode 100644 vendor/cloud.google.com/go/pubsub/go.mod create mode 100644 vendor/cloud.google.com/go/pubsub/go.sum create mode 100644 vendor/cloud.google.com/go/pubsub/go_mod_tidy_hack.go create mode 100644 vendor/cloud.google.com/go/storage/.repo-metadata.json create mode 100644 vendor/cloud.google.com/go/storage/CHANGES.md rename vendor/{github.com/google/certificate-transparency-go => cloud.google.com/go/storage}/LICENSE (100%) create mode 100644 vendor/cloud.google.com/go/storage/go.mod create mode 100644 vendor/cloud.google.com/go/storage/go.sum create mode 100644 vendor/cloud.google.com/go/storage/go_mod_tidy_hack.go create mode 100644 vendor/cloud.google.com/go/tools.go create mode 100644 vendor/code.cloudfoundry.org/go-diodes/.travis.yml create mode 100644 vendor/code.cloudfoundry.org/go-loggregator/.gitignore create mode 100644 vendor/code.cloudfoundry.org/go-loggregator/.travis.yml delete mode 100644 vendor/code.cloudfoundry.org/go-loggregator/go.mod delete mode 100644 vendor/code.cloudfoundry.org/go-loggregator/go.sum mode change 100755 => 100644 vendor/code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/generate.sh create mode 100644 vendor/code.cloudfoundry.org/rfc5424/.travis.yml delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/README.md delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/common.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/connection.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/go.mod delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/go.sum delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/nodeinfo.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/ocagent.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/options.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/transform_spans.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/transform_stats_to_metrics.go delete mode 100644 vendor/contrib.go.opencensus.io/exporter/ocagent/version.go create mode 100644 vendor/github.com/Azure/azure-amqp-common-go/v3/.gitignore create mode 100644 vendor/github.com/Azure/azure-amqp-common-go/v3/.travis.yml create mode 100644 vendor/github.com/Azure/azure-event-hubs-go/v3/.gitignore create mode 100644 vendor/github.com/Azure/azure-event-hubs-go/v3/.travis.yml create mode 100644 vendor/github.com/Azure/go-amqp/.gitattributes create mode 100644 vendor/github.com/Azure/go-amqp/.gitignore rename vendor/github.com/Azure/go-autorest/{ => autorest}/LICENSE (100%) create mode 100644 vendor/github.com/Azure/go-autorest/autorest/adal/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/adal/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/authorization_sas.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/authorization_storage.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/azure/auth/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/azure/auth/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/azure/cli/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/azure/cli/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/date/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/date/go.sum create mode 100644 vendor/github.com/Azure/go-autorest/autorest/date/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/to/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/to/go.sum create mode 100644 vendor/github.com/Azure/go-autorest/autorest/to/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/autorest/validation/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/autorest/validation/go_mod_tidy_hack.go create mode 100644 vendor/github.com/Azure/go-autorest/logger/LICENSE create mode 100644 vendor/github.com/Azure/go-autorest/tracing/LICENSE delete mode 100644 vendor/github.com/Azure/go-autorest/tracing/go.sum create mode 100644 vendor/github.com/BurntSushi/toml/.gitignore create mode 100644 vendor/github.com/BurntSushi/toml/.travis.yml create mode 100644 vendor/github.com/BurntSushi/toml/COMPATIBLE create mode 100644 vendor/github.com/BurntSushi/toml/COPYING create mode 100644 vendor/github.com/BurntSushi/toml/Makefile create mode 100644 vendor/github.com/BurntSushi/toml/README.md create mode 100644 vendor/github.com/BurntSushi/toml/decode.go create mode 100644 vendor/github.com/BurntSushi/toml/decode_meta.go create mode 100644 vendor/github.com/BurntSushi/toml/doc.go create mode 100644 vendor/github.com/BurntSushi/toml/encode.go create mode 100644 vendor/github.com/BurntSushi/toml/encoding_types.go create mode 100644 vendor/github.com/BurntSushi/toml/encoding_types_1.1.go create mode 100644 vendor/github.com/BurntSushi/toml/lex.go create mode 100644 vendor/github.com/BurntSushi/toml/parse.go create mode 100644 vendor/github.com/BurntSushi/toml/session.vim create mode 100644 vendor/github.com/BurntSushi/toml/type_check.go create mode 100644 vendor/github.com/BurntSushi/toml/type_fields.go delete mode 100644 vendor/github.com/DataDog/zstd/LICENSE delete mode 100644 vendor/github.com/DataDog/zstd/README.md delete mode 100644 vendor/github.com/DataDog/zstd/ZSTD_LICENSE delete mode 100644 vendor/github.com/DataDog/zstd/bitstream.h delete mode 100644 vendor/github.com/DataDog/zstd/config.h delete mode 100644 vendor/github.com/DataDog/zstd/divsufsort.c delete mode 100644 vendor/github.com/DataDog/zstd/divsufsort.h delete mode 100644 vendor/github.com/DataDog/zstd/divsufsort_private.h delete mode 100644 vendor/github.com/DataDog/zstd/error_private.h delete mode 100644 vendor/github.com/DataDog/zstd/error_public.h delete mode 100644 vendor/github.com/DataDog/zstd/fse.c delete mode 100644 vendor/github.com/DataDog/zstd/fse.h delete mode 100644 vendor/github.com/DataDog/zstd/fse_static.h delete mode 100644 vendor/github.com/DataDog/zstd/huff0.c delete mode 100644 vendor/github.com/DataDog/zstd/huff0.h delete mode 100644 vendor/github.com/DataDog/zstd/huff0_static.h delete mode 100644 vendor/github.com/DataDog/zstd/lfs.h delete mode 100644 vendor/github.com/DataDog/zstd/mem.h delete mode 100644 vendor/github.com/DataDog/zstd/sssort.c delete mode 100644 vendor/github.com/DataDog/zstd/trsort.c delete mode 100644 vendor/github.com/DataDog/zstd/zstd.go delete mode 100644 vendor/github.com/DataDog/zstd/zstd.h delete mode 100644 vendor/github.com/DataDog/zstd/zstd_buffered.c delete mode 100644 vendor/github.com/DataDog/zstd/zstd_buffered.h delete mode 100644 vendor/github.com/DataDog/zstd/zstd_buffered_static.h delete mode 100644 vendor/github.com/DataDog/zstd/zstd_compress.c delete mode 100644 vendor/github.com/DataDog/zstd/zstd_decompress.c delete mode 100644 vendor/github.com/DataDog/zstd/zstd_internal.h delete mode 100644 vendor/github.com/DataDog/zstd/zstd_static.h delete mode 100644 vendor/github.com/DataDog/zstd/zstd_stream.go create mode 100644 vendor/github.com/Masterminds/semver/.travis.yml create mode 100644 vendor/github.com/Masterminds/semver/appveyor.yml delete mode 100644 vendor/github.com/Masterminds/semver/fuzz.go delete mode 100644 vendor/github.com/Masterminds/semver/go.mod create mode 100644 vendor/github.com/Microsoft/go-winio/.gitignore create mode 100644 vendor/github.com/Shopify/sarama/.gitignore create mode 100644 vendor/github.com/Shopify/sarama/.travis.yml create mode 100644 vendor/github.com/Shopify/sarama/describe_log_dirs_request.go create mode 100644 vendor/github.com/Shopify/sarama/describe_log_dirs_response.go create mode 100644 vendor/github.com/Shopify/sarama/dev.yml create mode 100644 vendor/github.com/Shopify/sarama/sticky_assignor_user_data.go create mode 100644 vendor/github.com/Shopify/sarama/zstd.go delete mode 100644 vendor/github.com/Shopify/sarama/zstd_cgo.go delete mode 100644 vendor/github.com/Shopify/sarama/zstd_fallback.go create mode 100644 vendor/github.com/aerospike/aerospike-client-go/.build.yml create mode 100644 vendor/github.com/aerospike/aerospike-client-go/.gitignore create mode 100644 vendor/github.com/aerospike/aerospike-client-go/.travis.yml create mode 100644 vendor/github.com/aerospike/aerospike-client-go/pkg/bcrypt/.gitignore create mode 100644 vendor/github.com/andrewkroh/sys/AUTHORS create mode 100644 vendor/github.com/andrewkroh/sys/CONTRIBUTORS create mode 100644 vendor/github.com/armon/go-socks5/.gitignore create mode 100644 vendor/github.com/armon/go-socks5/.travis.yml delete mode 100644 vendor/github.com/aws/aws-lambda-go/Gopkg.lock delete mode 100644 vendor/github.com/aws/aws-lambda-go/Gopkg.toml delete mode 100644 vendor/github.com/aws/aws-lambda-go/README.md delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/CHANGELOG.md delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/CHANGELOG_PENDING.md delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/CODE_OF_CONDUCT.md delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/CONTRIBUTING.md delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/Gopkg.lock delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/Gopkg.toml delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/Makefile create mode 100644 vendor/github.com/aws/aws-sdk-go-v2/NOTICE.txt delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/README.md delete mode 100755 vendor/github.com/aws/aws-sdk-go-v2/cleanup_models.sh delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/doc.go delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/go.mod delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/go.sum delete mode 100644 vendor/github.com/aws/aws-sdk-go-v2/service/iam/iamiface/interface.go delete mode 100644 vendor/github.com/awslabs/goformation/LICENSE delete mode 100644 vendor/github.com/awslabs/goformation/v4/CHANGELOG.md delete mode 100644 vendor/github.com/awslabs/goformation/v4/CODE_OF_CONDUCT.md delete mode 100644 vendor/github.com/awslabs/goformation/v4/CONTRIBUTING.md delete mode 100644 vendor/github.com/awslabs/goformation/v4/README.md delete mode 100644 vendor/github.com/awslabs/goformation/v4/go.mod delete mode 100644 vendor/github.com/awslabs/goformation/v4/go.sum delete mode 100644 vendor/github.com/awslabs/goformation/v4/goformation.go delete mode 100644 vendor/github.com/awslabs/goformation/v4/test.go create mode 100644 vendor/github.com/beorn7/perks/quantile/exampledata.txt create mode 100644 vendor/github.com/blakesmith/ar/.gitignore create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/AUTHORS create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/LICENSE create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/README.md create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/appsTransport.go create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/go.mod create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/go.sum create mode 100644 vendor/github.com/bradleyfalzon/ghinstallation/transport.go create mode 100644 vendor/github.com/bsm/sarama-cluster/.gitignore create mode 100644 vendor/github.com/bsm/sarama-cluster/.travis.yml delete mode 100644 vendor/github.com/cavaliercoder/badio/LICENSE delete mode 100644 vendor/github.com/cavaliercoder/badio/Makefile delete mode 100644 vendor/github.com/cavaliercoder/badio/README.md delete mode 100644 vendor/github.com/cavaliercoder/badio/break_reader.go delete mode 100644 vendor/github.com/cavaliercoder/badio/byte_reader.go delete mode 100644 vendor/github.com/cavaliercoder/badio/doc.go delete mode 100644 vendor/github.com/cavaliercoder/badio/errors.go delete mode 100644 vendor/github.com/cavaliercoder/badio/random_reader.go delete mode 100644 vendor/github.com/cavaliercoder/badio/sequence_reader.go delete mode 100644 vendor/github.com/cavaliercoder/badio/truncate_reader.go create mode 100644 vendor/github.com/cavaliercoder/go-rpm/.gitignore mode change 100755 => 100644 vendor/github.com/cavaliercoder/go-rpm/version/vercmp_test.py delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1/common.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1/metrics_service.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1/metrics_service.pb.gw.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1/trace_service.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1/trace_service.pb.gw.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1/metrics.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1/resource.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1/trace.pb.go delete mode 100644 vendor/github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1/trace_config.pb.go create mode 100644 vendor/github.com/cespare/xxhash/v2/.travis.yml rename vendor/github.com/cespare/xxhash/{ => v2}/LICENSE.txt (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/README.md (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/go.mod (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/go.sum (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/xxhash.go (100%) create mode 100644 vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go rename vendor/github.com/cespare/xxhash/{ => v2}/xxhash_amd64.s (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/xxhash_other.go (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/xxhash_safe.go (100%) rename vendor/github.com/cespare/xxhash/{ => v2}/xxhash_unsafe.go (100%) delete mode 100644 vendor/github.com/cloudflare/cfssl/LICENSE delete mode 100644 vendor/github.com/cloudflare/cfssl/api/api.go delete mode 100644 vendor/github.com/cloudflare/cfssl/auth/auth.go delete mode 100644 vendor/github.com/cloudflare/cfssl/certdb/README.md delete mode 100644 vendor/github.com/cloudflare/cfssl/certdb/certdb.go delete mode 100644 vendor/github.com/cloudflare/cfssl/config/config.go delete mode 100644 vendor/github.com/cloudflare/cfssl/crypto/pkcs7/pkcs7.go delete mode 100644 vendor/github.com/cloudflare/cfssl/csr/csr.go delete mode 100644 vendor/github.com/cloudflare/cfssl/errors/doc.go delete mode 100644 vendor/github.com/cloudflare/cfssl/errors/error.go delete mode 100644 vendor/github.com/cloudflare/cfssl/errors/http.go delete mode 100644 vendor/github.com/cloudflare/cfssl/helpers/derhelpers/derhelpers.go delete mode 100644 vendor/github.com/cloudflare/cfssl/helpers/derhelpers/ed25519.go delete mode 100644 vendor/github.com/cloudflare/cfssl/helpers/helpers.go delete mode 100644 vendor/github.com/cloudflare/cfssl/info/info.go delete mode 100644 vendor/github.com/cloudflare/cfssl/initca/initca.go delete mode 100644 vendor/github.com/cloudflare/cfssl/log/log.go delete mode 100644 vendor/github.com/cloudflare/cfssl/ocsp/config/config.go delete mode 100644 vendor/github.com/cloudflare/cfssl/signer/local/local.go delete mode 100644 vendor/github.com/cloudflare/cfssl/signer/signer.go create mode 100644 vendor/github.com/cloudfoundry-community/go-cfclient/.gitignore create mode 100644 vendor/github.com/cloudfoundry-community/go-cfclient/.travis.yml create mode 100644 vendor/github.com/containerd/continuity/AUTHORS mode change 100755 => 100644 vendor/github.com/containerd/continuity/sysx/generate.sh create mode 100644 vendor/github.com/containerd/fifo/.gitignore create mode 100644 vendor/github.com/containerd/fifo/.travis.yml create mode 100644 vendor/github.com/coreos/bbolt/.gitignore create mode 100644 vendor/github.com/coreos/bbolt/appveyor.yml delete mode 100644 vendor/github.com/coreos/etcd/NOTICE delete mode 100644 vendor/github.com/coreos/etcd/raft/raftpb/confchange.go delete mode 100644 vendor/github.com/coreos/etcd/raft/raftpb/confstate.go delete mode 100644 vendor/github.com/coreos/etcd/raft/raftpb/raft.pb.go delete mode 100644 vendor/github.com/coreos/etcd/raft/raftpb/raft.proto delete mode 100644 vendor/github.com/coreos/go-systemd/dbus/methods.go rename vendor/github.com/coreos/go-systemd/{ => v22}/LICENSE (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/NOTICE (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/activation/files.go (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/activation/listeners.go (97%) rename vendor/github.com/coreos/go-systemd/{ => v22}/activation/packetconns.go (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/dbus/dbus.go (99%) create mode 100644 vendor/github.com/coreos/go-systemd/v22/dbus/methods.go rename vendor/github.com/coreos/go-systemd/{ => v22}/dbus/properties.go (99%) rename vendor/github.com/coreos/go-systemd/{ => v22}/dbus/set.go (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/dbus/subscription.go (99%) rename vendor/github.com/coreos/go-systemd/{ => v22}/dbus/subscription_set.go (100%) create mode 100644 vendor/github.com/coreos/go-systemd/v22/internal/dlopen/dlopen.go rename vendor/github.com/coreos/go-systemd/{ => v22}/sdjournal/functions.go (96%) rename vendor/github.com/coreos/go-systemd/{ => v22}/sdjournal/journal.go (100%) rename vendor/github.com/coreos/go-systemd/{ => v22}/sdjournal/read.go (100%) delete mode 100644 vendor/github.com/coreos/pkg/CONTRIBUTING.md delete mode 100644 vendor/github.com/coreos/pkg/DCO delete mode 100644 vendor/github.com/coreos/pkg/MAINTAINERS delete mode 100644 vendor/github.com/coreos/pkg/README.md delete mode 100755 vendor/github.com/coreos/pkg/build.sh delete mode 100644 vendor/github.com/coreos/pkg/code-of-conduct.md delete mode 100755 vendor/github.com/coreos/pkg/test.sh create mode 100644 vendor/github.com/denisenkom/go-mssqldb/appveyor.yml create mode 100644 vendor/github.com/devigned/tab/.gitignore create mode 100644 vendor/github.com/devigned/tab/.travis.yml create mode 100644 vendor/github.com/dgrijalva/jwt-go/.gitignore create mode 100644 vendor/github.com/dgrijalva/jwt-go/.travis.yml create mode 100644 vendor/github.com/digitalocean/go-libvirt/.travis.yml create mode 100644 vendor/github.com/dimchansky/utfbom/.gitignore create mode 100644 vendor/github.com/dimchansky/utfbom/.travis.yml create mode 100644 vendor/github.com/dlclark/regexp2/.gitignore create mode 100644 vendor/github.com/dlclark/regexp2/.travis.yml create mode 100644 vendor/github.com/docker/docker/AUTHORS delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/config.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/container.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/network.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/node.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/secret.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/service.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/swarm.go delete mode 100644 vendor/github.com/docker/docker/daemon/cluster/convert/task.go delete mode 100644 vendor/github.com/docker/docker/opts/address_pools.go delete mode 100644 vendor/github.com/docker/docker/opts/env.go delete mode 100644 vendor/github.com/docker/docker/opts/hosts.go delete mode 100644 vendor/github.com/docker/docker/opts/hosts_unix.go delete mode 100644 vendor/github.com/docker/docker/opts/hosts_windows.go delete mode 100644 vendor/github.com/docker/docker/opts/ip.go delete mode 100644 vendor/github.com/docker/docker/opts/opts.go delete mode 100644 vendor/github.com/docker/docker/opts/opts_unix.go delete mode 100644 vendor/github.com/docker/docker/opts/opts_windows.go delete mode 100644 vendor/github.com/docker/docker/opts/quotedstring.go delete mode 100644 vendor/github.com/docker/docker/opts/runtime.go delete mode 100644 vendor/github.com/docker/docker/opts/ulimit.go delete mode 100644 vendor/github.com/docker/docker/pkg/homedir/homedir_linux.go delete mode 100644 vendor/github.com/docker/docker/pkg/homedir/homedir_others.go delete mode 100644 vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go delete mode 100644 vendor/github.com/docker/docker/pkg/homedir/homedir_windows.go delete mode 100644 vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go delete mode 100644 vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go delete mode 100644 vendor/github.com/docker/go-events/CONTRIBUTING.md delete mode 100644 vendor/github.com/docker/go-events/LICENSE delete mode 100644 vendor/github.com/docker/go-events/MAINTAINERS delete mode 100644 vendor/github.com/docker/go-events/README.md delete mode 100644 vendor/github.com/docker/go-events/broadcast.go delete mode 100644 vendor/github.com/docker/go-events/channel.go delete mode 100644 vendor/github.com/docker/go-events/errors.go delete mode 100644 vendor/github.com/docker/go-events/event.go delete mode 100644 vendor/github.com/docker/go-events/filter.go delete mode 100644 vendor/github.com/docker/go-events/queue.go delete mode 100644 vendor/github.com/docker/go-events/retry.go create mode 100644 vendor/github.com/docker/go-units/circle.yml delete mode 100644 vendor/github.com/docker/libkv/LICENSE.code delete mode 100644 vendor/github.com/docker/libkv/LICENSE.docs delete mode 100644 vendor/github.com/docker/libkv/MAINTAINERS delete mode 100644 vendor/github.com/docker/libkv/README.md delete mode 100644 vendor/github.com/docker/libkv/libkv.go delete mode 100644 vendor/github.com/docker/libkv/store/helpers.go delete mode 100644 vendor/github.com/docker/libkv/store/store.go delete mode 100644 vendor/github.com/docker/libnetwork/datastore/cache.go delete mode 100644 vendor/github.com/docker/libnetwork/datastore/datastore.go delete mode 100644 vendor/github.com/docker/libnetwork/datastore/mock_store.go delete mode 100644 vendor/github.com/docker/libnetwork/discoverapi/discoverapi.go delete mode 100644 vendor/github.com/docker/libnetwork/ipamutils/utils.go delete mode 100644 vendor/github.com/docker/libnetwork/types/types.go delete mode 100644 vendor/github.com/docker/libtrust/CONTRIBUTING.md delete mode 100644 vendor/github.com/docker/libtrust/LICENSE delete mode 100644 vendor/github.com/docker/libtrust/MAINTAINERS delete mode 100644 vendor/github.com/docker/libtrust/README.md delete mode 100644 vendor/github.com/docker/libtrust/certificates.go delete mode 100644 vendor/github.com/docker/libtrust/doc.go delete mode 100644 vendor/github.com/docker/libtrust/ec_key.go delete mode 100644 vendor/github.com/docker/libtrust/filter.go delete mode 100644 vendor/github.com/docker/libtrust/hash.go delete mode 100644 vendor/github.com/docker/libtrust/jsonsign.go delete mode 100644 vendor/github.com/docker/libtrust/key.go delete mode 100644 vendor/github.com/docker/libtrust/key_files.go delete mode 100644 vendor/github.com/docker/libtrust/key_manager.go delete mode 100644 vendor/github.com/docker/libtrust/rsa_key.go delete mode 100644 vendor/github.com/docker/libtrust/util.go delete mode 100644 vendor/github.com/docker/swarmkit/LICENSE delete mode 100644 vendor/github.com/docker/swarmkit/api/README.md delete mode 100644 vendor/github.com/docker/swarmkit/api/ca.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/ca.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/control.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/control.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/deepcopy/copy.go delete mode 100644 vendor/github.com/docker/swarmkit/api/dispatcher.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/dispatcher.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/equality/equality.go delete mode 100644 vendor/github.com/docker/swarmkit/api/genericresource/helpers.go delete mode 100644 vendor/github.com/docker/swarmkit/api/genericresource/parse.go delete mode 100644 vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go delete mode 100644 vendor/github.com/docker/swarmkit/api/genericresource/string.go delete mode 100644 vendor/github.com/docker/swarmkit/api/genericresource/validate.go delete mode 100644 vendor/github.com/docker/swarmkit/api/health.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/health.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/logbroker.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/logbroker.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/naming/naming.go delete mode 100644 vendor/github.com/docker/swarmkit/api/objects.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/objects.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/raft.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/raft.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/resource.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/resource.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/snapshot.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/snapshot.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/specs.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/specs.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/storeobject.go delete mode 100644 vendor/github.com/docker/swarmkit/api/types.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/types.proto delete mode 100644 vendor/github.com/docker/swarmkit/api/watch.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/api/watch.proto delete mode 100644 vendor/github.com/docker/swarmkit/ca/auth.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/certificates.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/config.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/external.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/forward.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/keyreadwriter.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/reconciler.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/renewer.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/server.go delete mode 100644 vendor/github.com/docker/swarmkit/ca/transport.go delete mode 100644 vendor/github.com/docker/swarmkit/connectionbroker/broker.go delete mode 100644 vendor/github.com/docker/swarmkit/identity/combined_id.go delete mode 100644 vendor/github.com/docker/swarmkit/identity/doc.go delete mode 100644 vendor/github.com/docker/swarmkit/identity/randomid.go delete mode 100644 vendor/github.com/docker/swarmkit/ioutils/ioutils.go delete mode 100644 vendor/github.com/docker/swarmkit/log/context.go delete mode 100644 vendor/github.com/docker/swarmkit/log/grpc.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/raftselector/raftselector.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/proposer.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/apply.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/by.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/clusters.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/combinators.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/configs.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/doc.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/extensions.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/memory.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/networks.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/nodes.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/object.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/resources.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/secrets.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/services.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/store/tasks.go delete mode 100644 vendor/github.com/docker/swarmkit/manager/state/watch.go delete mode 100644 vendor/github.com/docker/swarmkit/protobuf/plugin/helpers.go delete mode 100644 vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go delete mode 100644 vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.proto delete mode 100644 vendor/github.com/docker/swarmkit/remotes/remotes.go delete mode 100644 vendor/github.com/docker/swarmkit/watch/queue/queue.go delete mode 100644 vendor/github.com/docker/swarmkit/watch/sinks.go delete mode 100644 vendor/github.com/docker/swarmkit/watch/watch.go create mode 100644 vendor/github.com/dop251/goja/.gitignore mode change 100755 => 100644 vendor/github.com/dop251/goja/token/tokenfmt create mode 100644 vendor/github.com/dustin/go-humanize/.travis.yml create mode 100644 vendor/github.com/eapache/go-xerial-snappy/.gitignore create mode 100644 vendor/github.com/eapache/go-xerial-snappy/.travis.yml create mode 100644 vendor/github.com/eapache/go-xerial-snappy/fuzz.go create mode 100644 vendor/github.com/eapache/queue/.gitignore create mode 100644 vendor/github.com/eapache/queue/.travis.yml create mode 100644 vendor/github.com/eclipse/paho.mqtt.golang/.gitignore create mode 100644 vendor/github.com/elastic/ecs/NOTICE.txt create mode 100644 vendor/github.com/elastic/go-libaudit/.gitignore create mode 100644 vendor/github.com/elastic/go-libaudit/.travis.yml create mode 100644 vendor/github.com/elastic/go-libaudit/NOTICE.txt delete mode 100644 vendor/github.com/elastic/go-libaudit/rule/defs_kernel_types.go create mode 100644 vendor/github.com/elastic/go-licenser/.gitignore create mode 100644 vendor/github.com/elastic/go-licenser/.goreleaser.yml create mode 100644 vendor/github.com/elastic/go-licenser/.travis.yml create mode 100644 vendor/github.com/elastic/go-licenser/appveyor.yml create mode 100644 vendor/github.com/elastic/go-lookslike/.gitignore create mode 100644 vendor/github.com/elastic/go-lookslike/.travis.yml create mode 100644 vendor/github.com/elastic/go-seccomp-bpf/.gitignore create mode 100644 vendor/github.com/elastic/go-seccomp-bpf/.travis.yml create mode 100644 vendor/github.com/elastic/go-seccomp-bpf/CHANGELOG.md create mode 100644 vendor/github.com/elastic/go-seccomp-bpf/NOTICE.txt delete mode 100644 vendor/github.com/elastic/go-seccomp-bpf/cmd/seccomp-profiler/disasm/disasm.go delete mode 100644 vendor/github.com/elastic/go-seccomp-bpf/cmd/seccomp-profiler/main.go create mode 100644 vendor/github.com/elastic/go-structform/.gitignore create mode 100644 vendor/github.com/elastic/go-structform/.travis.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/fold_map_inline.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/fold_refl_sel.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/stacks.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/types.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_arr.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_err.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_ignore.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_lookup_go.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_map.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_primitive.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_refl.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_templates.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_user_primitive.yml create mode 100644 vendor/github.com/elastic/go-structform/gotype/unfold_user_processing.yml create mode 100644 vendor/github.com/elastic/go-sysinfo/.appveyor.yml create mode 100644 vendor/github.com/elastic/go-sysinfo/.editorconfig create mode 100644 vendor/github.com/elastic/go-sysinfo/.gitattributes create mode 100644 vendor/github.com/elastic/go-sysinfo/.gitignore create mode 100644 vendor/github.com/elastic/go-sysinfo/.travis.yml create mode 100644 vendor/github.com/elastic/go-txfile/.gitignore create mode 100644 vendor/github.com/elastic/go-txfile/.travis.yml create mode 100644 vendor/github.com/elastic/go-ucfg/.editorconfig create mode 100644 vendor/github.com/elastic/go-ucfg/.gitignore create mode 100644 vendor/github.com/elastic/go-ucfg/.travis.yml delete mode 100644 vendor/github.com/elastic/go-ucfg/diff/keys.go delete mode 100644 vendor/github.com/elastic/go-ucfg/hjson/hjson.go create mode 100644 vendor/github.com/elastic/go-windows/.appveyor.yml create mode 100644 vendor/github.com/elastic/go-windows/.gitattributes create mode 100644 vendor/github.com/elastic/go-windows/.gitignore create mode 100644 vendor/github.com/elastic/go-windows/.travis.yml create mode 100644 vendor/github.com/elastic/go-windows/NOTICE.txt create mode 100644 vendor/github.com/elastic/gosigar/.appveyor.yml create mode 100644 vendor/github.com/elastic/gosigar/.gitignore create mode 100644 vendor/github.com/elastic/gosigar/.travis.yml create mode 100644 vendor/github.com/elastic/gosigar/codecov.yml delete mode 100644 vendor/github.com/elastic/gosigar/sys/windows/fix_generated.go create mode 100644 vendor/github.com/fatih/color/.travis.yml create mode 100644 vendor/github.com/fsnotify/fsevents/.editorconfig create mode 100644 vendor/github.com/fsnotify/fsevents/.gitignore create mode 100644 vendor/github.com/fsnotify/fsevents/.travis.yml create mode 100644 vendor/github.com/fsnotify/fsevents/circle.yml delete mode 100644 vendor/github.com/fsnotify/fsevents/example/main.go create mode 100644 vendor/github.com/fsnotify/fsnotify/.editorconfig create mode 100644 vendor/github.com/fsnotify/fsnotify/.gitignore create mode 100644 vendor/github.com/fsnotify/fsnotify/.travis.yml delete mode 100644 vendor/github.com/ghodss/yaml/LICENSE delete mode 100644 vendor/github.com/ghodss/yaml/README.md delete mode 100644 vendor/github.com/ghodss/yaml/fields.go delete mode 100644 vendor/github.com/ghodss/yaml/yaml.go delete mode 100644 vendor/github.com/go-ini/ini/LICENSE delete mode 100644 vendor/github.com/go-ini/ini/Makefile delete mode 100644 vendor/github.com/go-ini/ini/README.md delete mode 100644 vendor/github.com/go-ini/ini/error.go delete mode 100644 vendor/github.com/go-ini/ini/file.go delete mode 100644 vendor/github.com/go-ini/ini/ini.go delete mode 100644 vendor/github.com/go-ini/ini/key.go delete mode 100644 vendor/github.com/go-ini/ini/parser.go delete mode 100644 vendor/github.com/go-ini/ini/section.go delete mode 100644 vendor/github.com/go-ini/ini/struct.go create mode 100644 vendor/github.com/go-ole/go-ole/.travis.yml create mode 100644 vendor/github.com/go-ole/go-ole/appveyor.yml create mode 100644 vendor/github.com/go-sourcemap/sourcemap/.travis.yml create mode 100644 vendor/github.com/go-sql-driver/mysql/.gitignore create mode 100644 vendor/github.com/go-sql-driver/mysql/.travis.yml create mode 100644 vendor/github.com/gocarina/gocsv/.travis.yml create mode 100644 vendor/github.com/godbus/dbus/v5/.travis.yml rename vendor/github.com/godbus/dbus/{ => v5}/CONTRIBUTING.md (100%) rename vendor/github.com/godbus/dbus/{ => v5}/LICENSE (100%) rename vendor/github.com/godbus/dbus/{ => v5}/MAINTAINERS (100%) rename vendor/github.com/godbus/dbus/{ => v5}/README.markdown (100%) rename vendor/github.com/godbus/dbus/{ => v5}/auth.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/auth_anonymous.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/auth_external.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/auth_sha1.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/call.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/conn.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/conn_darwin.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/conn_other.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/conn_unix.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/conn_windows.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/dbus.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/decoder.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/default_handler.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/doc.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/encoder.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/export.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/go.mod (100%) rename vendor/github.com/godbus/dbus/{ => v5}/go.sum (100%) rename vendor/github.com/godbus/dbus/{ => v5}/homedir.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/homedir_dynamic.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/homedir_static.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/match.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/message.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/object.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/server_interfaces.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/sig.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_darwin.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_generic.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_nonce_tcp.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_tcp.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_unix.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_unixcred_dragonfly.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_unixcred_freebsd.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_unixcred_linux.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/transport_unixcred_openbsd.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/variant.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/variant_lexer.go (100%) rename vendor/github.com/godbus/dbus/{ => v5}/variant_parser.go (100%) create mode 100644 vendor/github.com/godror/godror/.gitignore create mode 100644 vendor/github.com/godror/godror/.golangci.yml create mode 100644 vendor/github.com/godror/godror/.travis.yml delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/cwallet.sso delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/env.sh delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/ewallet.p12 delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/keystore.jks delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/ojdbc.properties delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/reset.sql delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/sqlnet.ora delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/tnsnames.ora delete mode 100644 vendor/github.com/godror/godror/contrib/free.db/truststore.jks delete mode 100644 vendor/github.com/godror/godror/contrib/oracle-instant-client/Dockerfile delete mode 100644 vendor/github.com/godror/godror/contrib/oracle-instant-client/README.md delete mode 100644 vendor/github.com/godror/godror/contrib/oracle-xe-18c/Dockerfile delete mode 100644 vendor/github.com/godror/godror/contrib/oracle-xe-18c/README.md delete mode 100644 vendor/github.com/godror/godror/sid/sid.go create mode 100644 vendor/github.com/gofrs/flock/.gitignore create mode 100644 vendor/github.com/gofrs/flock/.travis.yml create mode 100644 vendor/github.com/gofrs/uuid/.gitignore create mode 100644 vendor/github.com/gofrs/uuid/.travis.yml delete mode 100644 vendor/github.com/gofrs/uuid/go.mod create mode 100644 vendor/github.com/gogo/protobuf/AUTHORS create mode 100644 vendor/github.com/gogo/protobuf/CONTRIBUTORS delete mode 100644 vendor/github.com/gogo/protobuf/types/any.go delete mode 100644 vendor/github.com/gogo/protobuf/types/any.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/api.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/doc.go delete mode 100644 vendor/github.com/gogo/protobuf/types/duration.go delete mode 100644 vendor/github.com/gogo/protobuf/types/duration.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/duration_gogo.go delete mode 100644 vendor/github.com/gogo/protobuf/types/empty.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/field_mask.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/protosize.go delete mode 100644 vendor/github.com/gogo/protobuf/types/source_context.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/struct.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/timestamp.go delete mode 100644 vendor/github.com/gogo/protobuf/types/timestamp.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/timestamp_gogo.go delete mode 100644 vendor/github.com/gogo/protobuf/types/type.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/wrappers.pb.go delete mode 100644 vendor/github.com/gogo/protobuf/types/wrappers_gogo.go delete mode 100644 vendor/github.com/golang/glog/README delete mode 100644 vendor/github.com/golang/glog/glog.go delete mode 100644 vendor/github.com/golang/glog/glog_file.go rename vendor/github.com/golang/{glog => groupcache}/LICENSE (100%) create mode 100644 vendor/github.com/golang/groupcache/lru/lru.go create mode 100644 vendor/github.com/golang/protobuf/AUTHORS create mode 100644 vendor/github.com/golang/protobuf/CONTRIBUTORS create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/doc.go create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/main.go create mode 100644 vendor/github.com/golang/snappy/.gitignore create mode 100644 vendor/github.com/golang/snappy/go.mod delete mode 100644 vendor/github.com/google/certificate-transparency-go/AUTHORS delete mode 100644 vendor/github.com/google/certificate-transparency-go/CHANGELOG.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/CONTRIBUTING.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/CONTRIBUTORS delete mode 100644 vendor/github.com/google/certificate-transparency-go/PULL_REQUEST_TEMPLATE.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/README.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/asn1/README.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/asn1/asn1.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/asn1/common.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/asn1/marshal.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/configpb/gen.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/configpb/multilog.pb.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/configpb/multilog.proto delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/getentries.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/logclient.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/client/multilog.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/cloudbuild.yaml delete mode 100644 vendor/github.com/google/certificate-transparency-go/cloudbuild_master.yaml delete mode 100644 vendor/github.com/google/certificate-transparency-go/cloudbuild_tag.yaml delete mode 100644 vendor/github.com/google/certificate-transparency-go/go.mod delete mode 100644 vendor/github.com/google/certificate-transparency-go/go.sum delete mode 100644 vendor/github.com/google/certificate-transparency-go/jsonclient/backoff.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/jsonclient/client.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/serialization.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/signatures.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/tls/signature.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/tls/tls.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/tls/types.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/types.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/README.md delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/cert_pool.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/curves.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/error.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/errors.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/names.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/nilref_nil_darwin.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/nilref_zero_darwin.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/pem_decrypt.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/pkcs1.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/pkcs8.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/pkix/pkix.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/ptr_sysptr_windows.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/ptr_uint_windows.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/revoked.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_bsd.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_cgo_darwin.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_darwin.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_darwin_armx.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_js.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_linux.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_nacl.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_nocgo_darwin.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_plan9.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_solaris.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_unix.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/root_windows.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/rpki.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/sec1.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/test-dir.crt delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/test-file.crt delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/verify.go delete mode 100644 vendor/github.com/google/certificate-transparency-go/x509/x509.go create mode 100644 vendor/github.com/google/go-github/v28/AUTHORS create mode 100644 vendor/github.com/google/go-github/v28/LICENSE create mode 100644 vendor/github.com/google/go-github/v28/github/activity.go create mode 100644 vendor/github.com/google/go-github/v28/github/activity_events.go create mode 100644 vendor/github.com/google/go-github/v28/github/activity_notifications.go create mode 100644 vendor/github.com/google/go-github/v28/github/activity_star.go create mode 100644 vendor/github.com/google/go-github/v28/github/activity_watching.go create mode 100644 vendor/github.com/google/go-github/v28/github/admin.go create mode 100644 vendor/github.com/google/go-github/v28/github/admin_orgs.go create mode 100644 vendor/github.com/google/go-github/v28/github/admin_stats.go create mode 100644 vendor/github.com/google/go-github/v28/github/admin_users.go create mode 100644 vendor/github.com/google/go-github/v28/github/apps.go create mode 100644 vendor/github.com/google/go-github/v28/github/apps_installation.go create mode 100644 vendor/github.com/google/go-github/v28/github/apps_marketplace.go create mode 100644 vendor/github.com/google/go-github/v28/github/authorizations.go create mode 100644 vendor/github.com/google/go-github/v28/github/checks.go create mode 100644 vendor/github.com/google/go-github/v28/github/doc.go create mode 100644 vendor/github.com/google/go-github/v28/github/event.go create mode 100644 vendor/github.com/google/go-github/v28/github/event_types.go create mode 100644 vendor/github.com/google/go-github/v28/github/gists.go create mode 100644 vendor/github.com/google/go-github/v28/github/gists_comments.go create mode 100644 vendor/github.com/google/go-github/v28/github/git.go create mode 100644 vendor/github.com/google/go-github/v28/github/git_blobs.go create mode 100644 vendor/github.com/google/go-github/v28/github/git_commits.go create mode 100644 vendor/github.com/google/go-github/v28/github/git_refs.go create mode 100644 vendor/github.com/google/go-github/v28/github/git_tags.go create mode 100644 vendor/github.com/google/go-github/v28/github/git_trees.go create mode 100644 vendor/github.com/google/go-github/v28/github/github-accessors.go create mode 100644 vendor/github.com/google/go-github/v28/github/github.go create mode 100644 vendor/github.com/google/go-github/v28/github/gitignore.go create mode 100644 vendor/github.com/google/go-github/v28/github/interactions.go create mode 100644 vendor/github.com/google/go-github/v28/github/interactions_orgs.go create mode 100644 vendor/github.com/google/go-github/v28/github/interactions_repos.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_assignees.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_comments.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_events.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_labels.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_milestones.go create mode 100644 vendor/github.com/google/go-github/v28/github/issues_timeline.go create mode 100644 vendor/github.com/google/go-github/v28/github/licenses.go create mode 100644 vendor/github.com/google/go-github/v28/github/messages.go create mode 100644 vendor/github.com/google/go-github/v28/github/migrations.go create mode 100644 vendor/github.com/google/go-github/v28/github/migrations_source_import.go create mode 100644 vendor/github.com/google/go-github/v28/github/migrations_user.go create mode 100644 vendor/github.com/google/go-github/v28/github/misc.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs_hooks.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs_members.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs_outside_collaborators.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs_projects.go create mode 100644 vendor/github.com/google/go-github/v28/github/orgs_users_blocking.go create mode 100644 vendor/github.com/google/go-github/v28/github/projects.go create mode 100644 vendor/github.com/google/go-github/v28/github/pulls.go create mode 100644 vendor/github.com/google/go-github/v28/github/pulls_comments.go create mode 100644 vendor/github.com/google/go-github/v28/github/pulls_reviewers.go create mode 100644 vendor/github.com/google/go-github/v28/github/pulls_reviews.go create mode 100644 vendor/github.com/google/go-github/v28/github/reactions.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_collaborators.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_comments.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_commits.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_community_health.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_contents.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_deployments.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_forks.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_hooks.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_invitations.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_keys.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_merging.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_pages.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_prereceive_hooks.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_projects.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_releases.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_stats.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_statuses.go create mode 100644 vendor/github.com/google/go-github/v28/github/repos_traffic.go create mode 100644 vendor/github.com/google/go-github/v28/github/search.go create mode 100644 vendor/github.com/google/go-github/v28/github/strings.go create mode 100644 vendor/github.com/google/go-github/v28/github/teams.go create mode 100644 vendor/github.com/google/go-github/v28/github/teams_discussion_comments.go create mode 100644 vendor/github.com/google/go-github/v28/github/teams_discussions.go create mode 100644 vendor/github.com/google/go-github/v28/github/teams_members.go create mode 100644 vendor/github.com/google/go-github/v28/github/timestamp.go create mode 100644 vendor/github.com/google/go-github/v28/github/users.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_administration.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_blocking.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_emails.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_followers.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_gpg_keys.go create mode 100644 vendor/github.com/google/go-github/v28/github/users_keys.go create mode 100644 vendor/github.com/google/go-github/v28/github/with_appengine.go create mode 100644 vendor/github.com/google/go-github/v28/github/without_appengine.go create mode 100644 vendor/github.com/google/go-github/v29/AUTHORS create mode 100644 vendor/github.com/google/go-github/v29/LICENSE create mode 100644 vendor/github.com/google/go-github/v29/github/activity.go create mode 100644 vendor/github.com/google/go-github/v29/github/activity_events.go create mode 100644 vendor/github.com/google/go-github/v29/github/activity_notifications.go create mode 100644 vendor/github.com/google/go-github/v29/github/activity_star.go create mode 100644 vendor/github.com/google/go-github/v29/github/activity_watching.go create mode 100644 vendor/github.com/google/go-github/v29/github/admin.go create mode 100644 vendor/github.com/google/go-github/v29/github/admin_orgs.go create mode 100644 vendor/github.com/google/go-github/v29/github/admin_stats.go create mode 100644 vendor/github.com/google/go-github/v29/github/admin_users.go create mode 100644 vendor/github.com/google/go-github/v29/github/apps.go create mode 100644 vendor/github.com/google/go-github/v29/github/apps_installation.go create mode 100644 vendor/github.com/google/go-github/v29/github/apps_manifest.go create mode 100644 vendor/github.com/google/go-github/v29/github/apps_marketplace.go create mode 100644 vendor/github.com/google/go-github/v29/github/authorizations.go create mode 100644 vendor/github.com/google/go-github/v29/github/checks.go create mode 100644 vendor/github.com/google/go-github/v29/github/doc.go create mode 100644 vendor/github.com/google/go-github/v29/github/event.go create mode 100644 vendor/github.com/google/go-github/v29/github/event_types.go create mode 100644 vendor/github.com/google/go-github/v29/github/gists.go create mode 100644 vendor/github.com/google/go-github/v29/github/gists_comments.go create mode 100644 vendor/github.com/google/go-github/v29/github/git.go create mode 100644 vendor/github.com/google/go-github/v29/github/git_blobs.go create mode 100644 vendor/github.com/google/go-github/v29/github/git_commits.go create mode 100644 vendor/github.com/google/go-github/v29/github/git_refs.go create mode 100644 vendor/github.com/google/go-github/v29/github/git_tags.go create mode 100644 vendor/github.com/google/go-github/v29/github/git_trees.go create mode 100644 vendor/github.com/google/go-github/v29/github/github-accessors.go create mode 100644 vendor/github.com/google/go-github/v29/github/github.go create mode 100644 vendor/github.com/google/go-github/v29/github/gitignore.go create mode 100644 vendor/github.com/google/go-github/v29/github/interactions.go create mode 100644 vendor/github.com/google/go-github/v29/github/interactions_orgs.go create mode 100644 vendor/github.com/google/go-github/v29/github/interactions_repos.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_assignees.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_comments.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_events.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_labels.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_milestones.go create mode 100644 vendor/github.com/google/go-github/v29/github/issues_timeline.go create mode 100644 vendor/github.com/google/go-github/v29/github/licenses.go create mode 100644 vendor/github.com/google/go-github/v29/github/messages.go create mode 100644 vendor/github.com/google/go-github/v29/github/migrations.go create mode 100644 vendor/github.com/google/go-github/v29/github/migrations_source_import.go create mode 100644 vendor/github.com/google/go-github/v29/github/migrations_user.go create mode 100644 vendor/github.com/google/go-github/v29/github/misc.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs_hooks.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs_members.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs_outside_collaborators.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs_projects.go create mode 100644 vendor/github.com/google/go-github/v29/github/orgs_users_blocking.go create mode 100644 vendor/github.com/google/go-github/v29/github/projects.go create mode 100644 vendor/github.com/google/go-github/v29/github/pulls.go create mode 100644 vendor/github.com/google/go-github/v29/github/pulls_comments.go create mode 100644 vendor/github.com/google/go-github/v29/github/pulls_reviewers.go create mode 100644 vendor/github.com/google/go-github/v29/github/pulls_reviews.go create mode 100644 vendor/github.com/google/go-github/v29/github/reactions.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_collaborators.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_comments.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_commits.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_community_health.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_contents.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_deployments.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_forks.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_hooks.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_invitations.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_keys.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_merging.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_pages.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_prereceive_hooks.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_projects.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_releases.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_stats.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_statuses.go create mode 100644 vendor/github.com/google/go-github/v29/github/repos_traffic.go create mode 100644 vendor/github.com/google/go-github/v29/github/search.go create mode 100644 vendor/github.com/google/go-github/v29/github/strings.go create mode 100644 vendor/github.com/google/go-github/v29/github/teams.go create mode 100644 vendor/github.com/google/go-github/v29/github/teams_discussion_comments.go create mode 100644 vendor/github.com/google/go-github/v29/github/teams_discussions.go create mode 100644 vendor/github.com/google/go-github/v29/github/teams_members.go create mode 100644 vendor/github.com/google/go-github/v29/github/timestamp.go create mode 100644 vendor/github.com/google/go-github/v29/github/users.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_administration.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_blocking.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_emails.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_followers.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_gpg_keys.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_keys.go create mode 100644 vendor/github.com/google/go-github/v29/github/users_projects.go create mode 100644 vendor/github.com/google/go-github/v29/github/with_appengine.go create mode 100644 vendor/github.com/google/go-github/v29/github/without_appengine.go create mode 100644 vendor/github.com/google/go-querystring/LICENSE create mode 100644 vendor/github.com/google/go-querystring/query/encode.go create mode 100644 vendor/github.com/google/gofuzz/.travis.yml create mode 100644 vendor/github.com/google/gopacket/.gitignore create mode 100644 vendor/github.com/google/gopacket/.travis.gofmt.sh create mode 100644 vendor/github.com/google/gopacket/.travis.golint.sh create mode 100644 vendor/github.com/google/gopacket/.travis.govet.sh create mode 100644 vendor/github.com/google/gopacket/.travis.install.sh create mode 100644 vendor/github.com/google/gopacket/.travis.script.sh create mode 100644 vendor/github.com/google/gopacket/.travis.yml mode change 100755 => 100644 vendor/github.com/google/gopacket/gc create mode 100644 vendor/github.com/google/gopacket/layers/.lint_blacklist mode change 100755 => 100644 vendor/github.com/google/gopacket/layers/test_creator.py create mode 100644 vendor/github.com/google/uuid/.travis.yml rename vendor/github.com/googleapis/gax-go/{ => v2}/LICENSE (100%) mode change 100755 => 100644 vendor/github.com/googleapis/gnostic/extensions/COMPILE-EXTENSION.sh create mode 100644 vendor/github.com/gorilla/websocket/.gitignore delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/CHANGELOG.md delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/LICENSE delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/README.md delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/client.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/client_metrics.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/client_reporter.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/go.mod delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/go.sum delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/makefile delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/metric_options.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/server.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/server_metrics.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/server_reporter.go delete mode 100644 vendor/github.com/grpc-ecosystem/go-grpc-prometheus/util.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/LICENSE.txt delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/internal/BUILD.bazel delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.pb.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.proto delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/BUILD.bazel delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/doc.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_json.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_proto.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshaler_registry.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto2_convert.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto_errors.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/BUILD.bazel delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/doc.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/pattern.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/readerfactory.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/trie.go delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/CHANGELOG.md delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/LICENSE delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/README.md delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/edges.go delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/go.mod delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/go.sum delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/iradix.go delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/iter.go delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/node.go delete mode 100644 vendor/github.com/hashicorp/go-immutable-radix/raw_iter.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/LICENSE delete mode 100644 vendor/github.com/hashicorp/go-memdb/README.md delete mode 100644 vendor/github.com/hashicorp/go-memdb/filter.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/go.mod delete mode 100644 vendor/github.com/hashicorp/go-memdb/go.sum delete mode 100644 vendor/github.com/hashicorp/go-memdb/index.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/memdb.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/schema.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/txn.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/watch.go delete mode 100644 vendor/github.com/hashicorp/go-memdb/watch_few.go create mode 100644 vendor/github.com/hashicorp/go-uuid/.travis.yml create mode 100644 vendor/github.com/hashicorp/go-version/.travis.yml create mode 100644 vendor/github.com/hashicorp/go-version/LICENSE create mode 100644 vendor/github.com/hashicorp/go-version/README.md create mode 100644 vendor/github.com/hashicorp/go-version/constraint.go create mode 100644 vendor/github.com/hashicorp/go-version/go.mod create mode 100644 vendor/github.com/hashicorp/go-version/version.go create mode 100644 vendor/github.com/hashicorp/go-version/version_collection.go create mode 100644 vendor/github.com/hashicorp/golang-lru/.gitignore create mode 100644 vendor/github.com/haya14busa/go-actions-toolkit/LICENSE create mode 100644 vendor/github.com/haya14busa/go-actions-toolkit/core/README.md create mode 100644 vendor/github.com/haya14busa/go-actions-toolkit/core/command.go create mode 100644 vendor/github.com/haya14busa/go-actions-toolkit/core/core.go create mode 100644 vendor/github.com/imdario/mergo/.gitignore create mode 100644 vendor/github.com/imdario/mergo/.travis.yml create mode 100644 vendor/github.com/insomniacslk/dhcp/CONTRIBUTORS.md delete mode 100644 vendor/github.com/ishidawataru/sctp/LICENSE delete mode 100644 vendor/github.com/ishidawataru/sctp/README.md delete mode 100644 vendor/github.com/ishidawataru/sctp/ipsock_linux.go delete mode 100644 vendor/github.com/ishidawataru/sctp/sctp.go delete mode 100644 vendor/github.com/ishidawataru/sctp/sctp_linux.go delete mode 100644 vendor/github.com/ishidawataru/sctp/sctp_unsupported.go create mode 100644 vendor/github.com/jmespath/go-jmespath/.gitignore create mode 100644 vendor/github.com/jmespath/go-jmespath/.travis.yml create mode 100644 vendor/github.com/jmoiron/sqlx/.gitignore create mode 100644 vendor/github.com/jmoiron/sqlx/.travis.yml create mode 100644 vendor/github.com/json-iterator/go/.codecov.yml create mode 100644 vendor/github.com/json-iterator/go/.gitignore create mode 100644 vendor/github.com/json-iterator/go/.travis.yml mode change 100755 => 100644 vendor/github.com/json-iterator/go/build.sh mode change 100755 => 100644 vendor/github.com/json-iterator/go/test.sh create mode 100644 vendor/github.com/jstemmer/go-junit-report/.gitignore create mode 100644 vendor/github.com/jstemmer/go-junit-report/.travis.yml create mode 100644 vendor/github.com/jstemmer/go-junit-report/go.mod delete mode 100644 vendor/github.com/klauspost/compress/flate/copy.go delete mode 100644 vendor/github.com/klauspost/compress/flate/crc32_amd64.go delete mode 100644 vendor/github.com/klauspost/compress/flate/crc32_amd64.s delete mode 100644 vendor/github.com/klauspost/compress/flate/crc32_noasm.go create mode 100644 vendor/github.com/klauspost/compress/flate/fast_encoder.go delete mode 100644 vendor/github.com/klauspost/compress/flate/gen.go create mode 100644 vendor/github.com/klauspost/compress/flate/level1.go create mode 100644 vendor/github.com/klauspost/compress/flate/level2.go create mode 100644 vendor/github.com/klauspost/compress/flate/level3.go create mode 100644 vendor/github.com/klauspost/compress/flate/level4.go create mode 100644 vendor/github.com/klauspost/compress/flate/level5.go create mode 100644 vendor/github.com/klauspost/compress/flate/level6.go delete mode 100644 vendor/github.com/klauspost/compress/flate/reverse_bits.go delete mode 100644 vendor/github.com/klauspost/compress/flate/snappy.go create mode 100644 vendor/github.com/klauspost/compress/flate/stateless.go create mode 100644 vendor/github.com/klauspost/compress/fse/README.md create mode 100644 vendor/github.com/klauspost/compress/fse/bitreader.go create mode 100644 vendor/github.com/klauspost/compress/fse/bitwriter.go create mode 100644 vendor/github.com/klauspost/compress/fse/bytereader.go create mode 100644 vendor/github.com/klauspost/compress/fse/compress.go create mode 100644 vendor/github.com/klauspost/compress/fse/decompress.go create mode 100644 vendor/github.com/klauspost/compress/fse/fse.go create mode 100644 vendor/github.com/klauspost/compress/huff0/.gitignore create mode 100644 vendor/github.com/klauspost/compress/huff0/README.md create mode 100644 vendor/github.com/klauspost/compress/huff0/bitreader.go create mode 100644 vendor/github.com/klauspost/compress/huff0/bitwriter.go create mode 100644 vendor/github.com/klauspost/compress/huff0/bytereader.go create mode 100644 vendor/github.com/klauspost/compress/huff0/compress.go create mode 100644 vendor/github.com/klauspost/compress/huff0/decompress.go create mode 100644 vendor/github.com/klauspost/compress/huff0/huff0.go create mode 100644 vendor/github.com/klauspost/compress/snappy/.gitignore create mode 100644 vendor/github.com/klauspost/compress/snappy/AUTHORS create mode 100644 vendor/github.com/klauspost/compress/snappy/CONTRIBUTORS create mode 100644 vendor/github.com/klauspost/compress/snappy/LICENSE create mode 100644 vendor/github.com/klauspost/compress/snappy/README create mode 100644 vendor/github.com/klauspost/compress/snappy/decode.go create mode 100644 vendor/github.com/klauspost/compress/snappy/decode_amd64.go create mode 100644 vendor/github.com/klauspost/compress/snappy/decode_amd64.s create mode 100644 vendor/github.com/klauspost/compress/snappy/decode_other.go create mode 100644 vendor/github.com/klauspost/compress/snappy/encode.go create mode 100644 vendor/github.com/klauspost/compress/snappy/encode_amd64.go create mode 100644 vendor/github.com/klauspost/compress/snappy/encode_amd64.s create mode 100644 vendor/github.com/klauspost/compress/snappy/encode_other.go create mode 100644 vendor/github.com/klauspost/compress/snappy/runbench.cmd create mode 100644 vendor/github.com/klauspost/compress/snappy/snappy.go create mode 100644 vendor/github.com/klauspost/compress/zstd/README.md create mode 100644 vendor/github.com/klauspost/compress/zstd/bitreader.go create mode 100644 vendor/github.com/klauspost/compress/zstd/bitwriter.go create mode 100644 vendor/github.com/klauspost/compress/zstd/blockdec.go create mode 100644 vendor/github.com/klauspost/compress/zstd/blockenc.go create mode 100644 vendor/github.com/klauspost/compress/zstd/blocktype_string.go create mode 100644 vendor/github.com/klauspost/compress/zstd/bytebuf.go create mode 100644 vendor/github.com/klauspost/compress/zstd/bytereader.go create mode 100644 vendor/github.com/klauspost/compress/zstd/decoder.go create mode 100644 vendor/github.com/klauspost/compress/zstd/decoder_options.go create mode 100644 vendor/github.com/klauspost/compress/zstd/enc_dfast.go create mode 100644 vendor/github.com/klauspost/compress/zstd/enc_fast.go create mode 100644 vendor/github.com/klauspost/compress/zstd/enc_params.go create mode 100644 vendor/github.com/klauspost/compress/zstd/encoder.go create mode 100644 vendor/github.com/klauspost/compress/zstd/encoder_options.go create mode 100644 vendor/github.com/klauspost/compress/zstd/framedec.go create mode 100644 vendor/github.com/klauspost/compress/zstd/frameenc.go create mode 100644 vendor/github.com/klauspost/compress/zstd/fse_decoder.go create mode 100644 vendor/github.com/klauspost/compress/zstd/fse_encoder.go create mode 100644 vendor/github.com/klauspost/compress/zstd/fse_predefined.go create mode 100644 vendor/github.com/klauspost/compress/zstd/hash.go create mode 100644 vendor/github.com/klauspost/compress/zstd/history.go create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go rename vendor/github.com/{cespare => klauspost/compress/zstd/internal}/xxhash/xxhash_amd64.go (100%) create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go create mode 100644 vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_safe.go create mode 100644 vendor/github.com/klauspost/compress/zstd/seqdec.go create mode 100644 vendor/github.com/klauspost/compress/zstd/seqenc.go create mode 100644 vendor/github.com/klauspost/compress/zstd/snappy.go create mode 100644 vendor/github.com/klauspost/compress/zstd/zstd.go delete mode 100644 vendor/github.com/klauspost/cpuid/LICENSE delete mode 100644 vendor/github.com/klauspost/cpuid/README.md delete mode 100644 vendor/github.com/klauspost/cpuid/cpuid.go delete mode 100644 vendor/github.com/klauspost/cpuid/cpuid_386.s delete mode 100644 vendor/github.com/klauspost/cpuid/cpuid_amd64.s delete mode 100644 vendor/github.com/klauspost/cpuid/detect_intel.go delete mode 100644 vendor/github.com/klauspost/cpuid/detect_ref.go delete mode 100644 vendor/github.com/klauspost/cpuid/generate.go delete mode 100644 vendor/github.com/klauspost/cpuid/private-gen.go delete mode 100644 vendor/github.com/klauspost/crc32/LICENSE delete mode 100644 vendor/github.com/klauspost/crc32/README.md delete mode 100644 vendor/github.com/klauspost/crc32/crc32.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64.s delete mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64p32.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64p32.s delete mode 100644 vendor/github.com/klauspost/crc32/crc32_generic.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_otherarch.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_s390x.go delete mode 100644 vendor/github.com/klauspost/crc32/crc32_s390x.s create mode 100644 vendor/github.com/lib/pq/.gitignore create mode 100644 vendor/github.com/lib/pq/.travis.sh create mode 100644 vendor/github.com/lib/pq/.travis.yml create mode 100644 vendor/github.com/magefile/mage/.gitattributes create mode 100644 vendor/github.com/magefile/mage/.gitignore create mode 100644 vendor/github.com/magefile/mage/.goreleaser.yml create mode 100644 vendor/github.com/magefile/mage/.travis.yml delete mode 100644 vendor/github.com/magefile/mage/bootstrap.go create mode 100644 vendor/github.com/mailru/easyjson/.gitignore create mode 100644 vendor/github.com/mailru/easyjson/.travis.yml create mode 100644 vendor/github.com/mattn/go-colorable/.travis.yml create mode 100644 vendor/github.com/mattn/go-ieproxy/.gitignore create mode 100644 vendor/github.com/mattn/go-isatty/.travis.yml create mode 100644 vendor/github.com/mattn/go-shellwords/.travis.yml create mode 100644 vendor/github.com/mattn/go-shellwords/LICENSE create mode 100644 vendor/github.com/mattn/go-shellwords/README.md create mode 100644 vendor/github.com/mattn/go-shellwords/go.mod create mode 100644 vendor/github.com/mattn/go-shellwords/go.test.sh create mode 100644 vendor/github.com/mattn/go-shellwords/shellwords.go create mode 100644 vendor/github.com/mattn/go-shellwords/util_go15.go create mode 100644 vendor/github.com/mattn/go-shellwords/util_posix.go create mode 100644 vendor/github.com/mattn/go-shellwords/util_windows.go create mode 100644 vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore create mode 100644 vendor/github.com/miekg/dns/.codecov.yml create mode 100644 vendor/github.com/miekg/dns/.gitignore create mode 100644 vendor/github.com/miekg/dns/.travis.yml delete mode 100644 vendor/github.com/miekg/dns/duplicate_generate.go delete mode 100644 vendor/github.com/miekg/dns/msg_generate.go delete mode 100644 vendor/github.com/miekg/dns/types_generate.go create mode 100644 vendor/github.com/mitchellh/gox/.gitattributes create mode 100644 vendor/github.com/mitchellh/gox/.gitignore create mode 100644 vendor/github.com/mitchellh/gox/.travis.yml create mode 100644 vendor/github.com/mitchellh/gox/Gopkg.lock create mode 100644 vendor/github.com/mitchellh/gox/Gopkg.toml create mode 100644 vendor/github.com/mitchellh/gox/LICENSE create mode 100644 vendor/github.com/mitchellh/gox/README.md create mode 100644 vendor/github.com/mitchellh/gox/appveyor.yml create mode 100644 vendor/github.com/mitchellh/gox/env_override.go create mode 100644 vendor/github.com/mitchellh/gox/go.go create mode 100644 vendor/github.com/mitchellh/gox/go.mod create mode 100644 vendor/github.com/mitchellh/gox/go.sum create mode 100644 vendor/github.com/mitchellh/gox/main.go create mode 100644 vendor/github.com/mitchellh/gox/main_osarch.go create mode 100644 vendor/github.com/mitchellh/gox/platform.go create mode 100644 vendor/github.com/mitchellh/gox/platform_flag.go create mode 100644 vendor/github.com/mitchellh/gox/toolchain.go create mode 100644 vendor/github.com/mitchellh/iochan/LICENSE.md create mode 100644 vendor/github.com/mitchellh/iochan/README.md create mode 100644 vendor/github.com/mitchellh/iochan/go.mod create mode 100644 vendor/github.com/mitchellh/iochan/iochan.go create mode 100644 vendor/github.com/mitchellh/mapstructure/.travis.yml create mode 100644 vendor/github.com/modern-go/concurrent/.gitignore create mode 100644 vendor/github.com/modern-go/concurrent/.travis.yml mode change 100755 => 100644 vendor/github.com/modern-go/concurrent/test.sh create mode 100644 vendor/github.com/modern-go/reflect2/.gitignore create mode 100644 vendor/github.com/modern-go/reflect2/.travis.yml mode change 100755 => 100644 vendor/github.com/modern-go/reflect2/test.sh create mode 100644 vendor/github.com/opencontainers/go-digest/.mailmap create mode 100644 vendor/github.com/opencontainers/go-digest/.pullapprove.yml create mode 100644 vendor/github.com/opencontainers/go-digest/.travis.yml create mode 100644 vendor/github.com/pierrec/lz4/.gitignore create mode 100644 vendor/github.com/pierrec/lz4/.travis.yml create mode 100644 vendor/github.com/pierrec/lz4/debug.go create mode 100644 vendor/github.com/pierrec/lz4/debug_stub.go create mode 100644 vendor/github.com/pierrec/lz4/decode_amd64.go create mode 100644 vendor/github.com/pierrec/lz4/decode_amd64.s create mode 100644 vendor/github.com/pierrec/lz4/decode_other.go create mode 100644 vendor/github.com/pierrec/lz4/errors.go create mode 100644 vendor/github.com/pierrec/lz4/internal/xxh32/xxh32zero.go create mode 100644 vendor/github.com/pierrec/lz4/lz4_go1.10.go create mode 100644 vendor/github.com/pierrec/lz4/lz4_notgo1.10.go delete mode 100644 vendor/github.com/pierrec/xxHash/LICENSE delete mode 100644 vendor/github.com/pierrec/xxHash/xxHash32/xxHash32.go create mode 100644 vendor/github.com/pierrre/gotestcover/.gitignore create mode 100644 vendor/github.com/pierrre/gotestcover/.travis.yml create mode 100644 vendor/github.com/pkg/errors/.gitignore create mode 100644 vendor/github.com/pkg/errors/.travis.yml create mode 100644 vendor/github.com/pkg/errors/Makefile create mode 100644 vendor/github.com/pkg/errors/appveyor.yml create mode 100644 vendor/github.com/pkg/errors/go113.go create mode 100644 vendor/github.com/prometheus/client_golang/prometheus/.gitignore create mode 100644 vendor/github.com/prometheus/procfs/.gitignore create mode 100644 vendor/github.com/prometheus/procfs/.golangci.yml delete mode 100644 vendor/github.com/prometheus/procfs/nfs/nfs.go delete mode 100644 vendor/github.com/prometheus/procfs/nfs/parse.go delete mode 100644 vendor/github.com/prometheus/procfs/nfs/parse_nfs.go delete mode 100644 vendor/github.com/prometheus/procfs/nfs/parse_nfsd.go mode change 100755 => 100644 vendor/github.com/prometheus/procfs/ttar delete mode 100644 vendor/github.com/prometheus/procfs/xfs/parse.go delete mode 100644 vendor/github.com/prometheus/procfs/xfs/xfs.go create mode 100644 vendor/github.com/rcrowley/go-metrics/.gitignore create mode 100644 vendor/github.com/rcrowley/go-metrics/.travis.yml delete mode 100644 vendor/github.com/rcrowley/go-metrics/exp/exp.go mode change 100755 => 100644 vendor/github.com/rcrowley/go-metrics/validate.sh create mode 100644 vendor/github.com/reviewdog/errorformat/.codecov.yml create mode 100644 vendor/github.com/reviewdog/errorformat/.gitignore create mode 100644 vendor/github.com/reviewdog/errorformat/.travis.yml create mode 100644 vendor/github.com/reviewdog/errorformat/LICENSE create mode 100644 vendor/github.com/reviewdog/errorformat/README.md create mode 100644 vendor/github.com/reviewdog/errorformat/errorformat.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/README.md create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/ansible.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/css.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/doc.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/env.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/fmt.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/go.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/javascript.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/php.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/puppet.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/python.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/ruby.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/rust.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/scala.go create mode 100644 vendor/github.com/reviewdog/errorformat/fmts/typescript.go create mode 100644 vendor/github.com/reviewdog/errorformat/go.mod create mode 100644 vendor/github.com/reviewdog/errorformat/go.sum create mode 100644 vendor/github.com/reviewdog/errorformat/reviewdog.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/.codecov.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/.gitignore create mode 100644 vendor/github.com/reviewdog/reviewdog/.gitlab-ci.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/.goreleaser.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/.reviewdog.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/.revive.toml create mode 100644 vendor/github.com/reviewdog/reviewdog/.textlintrc create mode 100644 vendor/github.com/reviewdog/reviewdog/.travis.yml create mode 100644 vendor/github.com/reviewdog/reviewdog/LICENSE create mode 100644 vendor/github.com/reviewdog/reviewdog/README.md create mode 100644 vendor/github.com/reviewdog/reviewdog/cienv/cienv.go create mode 100644 vendor/github.com/reviewdog/reviewdog/cienv/github_actions.go create mode 100644 vendor/github.com/reviewdog/reviewdog/cmd/reviewdog/.gitignore create mode 100644 vendor/github.com/reviewdog/reviewdog/cmd/reviewdog/doghouse.go create mode 100644 vendor/github.com/reviewdog/reviewdog/cmd/reviewdog/main.go create mode 100644 vendor/github.com/reviewdog/reviewdog/commands/version.go create mode 100644 vendor/github.com/reviewdog/reviewdog/comment.go create mode 100644 vendor/github.com/reviewdog/reviewdog/comment_iowriter.go create mode 100644 vendor/github.com/reviewdog/reviewdog/diff.go create mode 100644 vendor/github.com/reviewdog/reviewdog/diff/diff.go create mode 100644 vendor/github.com/reviewdog/reviewdog/diff/parse.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/client/client.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/client/github_client.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/doghouse.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/github.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/github_checker.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/storage/datastore.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/storage/installation.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/storage/token.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/server/token.go create mode 100644 vendor/github.com/reviewdog/reviewdog/doghouse/service.go create mode 100644 vendor/github.com/reviewdog/reviewdog/filter.go create mode 100644 vendor/github.com/reviewdog/reviewdog/go.mod create mode 100644 vendor/github.com/reviewdog/reviewdog/go.sum create mode 100644 vendor/github.com/reviewdog/reviewdog/install.sh create mode 100644 vendor/github.com/reviewdog/reviewdog/package-lock.json create mode 100644 vendor/github.com/reviewdog/reviewdog/package.json create mode 100644 vendor/github.com/reviewdog/reviewdog/parser.go create mode 100644 vendor/github.com/reviewdog/reviewdog/project/cmdbuilder.go create mode 100644 vendor/github.com/reviewdog/reviewdog/project/conf.go create mode 100644 vendor/github.com/reviewdog/reviewdog/project/run.go create mode 100644 vendor/github.com/reviewdog/reviewdog/resultmap.go create mode 100644 vendor/github.com/reviewdog/reviewdog/reviewdog.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/github/github.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/github/githubutils/comment_writer.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/github/githubutils/utils.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/gitlab/gitlab_mr_commit.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/gitlab/gitlab_mr_diff.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/gitlab/gitlab_mr_discussion.go create mode 100644 vendor/github.com/reviewdog/reviewdog/service/serviceutil/serviceutil.go delete mode 100644 vendor/github.com/samuel/go-parser/LICENSE delete mode 100644 vendor/github.com/samuel/go-parser/README.md create mode 100644 vendor/github.com/sanathkr/go-yaml/.gitignore create mode 100644 vendor/github.com/sanathkr/go-yaml/.travis.yml create mode 100644 vendor/github.com/sanathkr/yaml/.gitignore create mode 100644 vendor/github.com/sanathkr/yaml/.travis.yml delete mode 100644 vendor/github.com/shirou/gopsutil/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 vendor/github.com/shirou/gopsutil/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 vendor/github.com/shirou/gopsutil/Gopkg.lock delete mode 100644 vendor/github.com/shirou/gopsutil/Gopkg.toml delete mode 100644 vendor/github.com/shirou/gopsutil/Makefile delete mode 100644 vendor/github.com/shirou/gopsutil/README.rst delete mode 100644 vendor/github.com/shirou/gopsutil/coverall.sh delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_fallback.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd_arm.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_openbsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_solaris.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/testdata/linux/424/proc/stat delete mode 100755 vendor/github.com/shirou/gopsutil/cpu/testdata/linux/times_empty/proc/stat delete mode 100644 vendor/github.com/shirou/gopsutil/doc.go delete mode 100644 vendor/github.com/shirou/gopsutil/docker/docker.go delete mode 100644 vendor/github.com/shirou/gopsutil/docker/docker_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/docker/docker_notlinux.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/freebsd_headers/utxdb.h delete mode 100644 vendor/github.com/shirou/gopsutil/host/host.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_darwin.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_darwin_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_darwin_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_fallback.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd_arm.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_arm.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_arm64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_mips.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_mips64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_mips64le.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_mipsle.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_ppc64le.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_s390x.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_openbsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_openbsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_posix.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_solaris.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/host_windows.go delete mode 100644 vendor/github.com/shirou/gopsutil/host/types.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load_bsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load_darwin.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load_fallback.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/load/load_windows.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_fallback.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_openbsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_openbsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_solaris.go delete mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_windows.go delete mode 100644 vendor/github.com/shirou/gopsutil/mktypes.sh delete mode 100644 vendor/github.com/shirou/gopsutil/process/process.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin_cgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin_nocgo.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_fallback.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd_arm.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_openbsd.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_openbsd_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_posix.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows_386.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows_amd64.go delete mode 100644 vendor/github.com/shirou/gopsutil/process/testdata/darwin/ps-ax-opid_fail delete mode 100644 vendor/github.com/shirou/gopsutil/v2migration.sh delete mode 100644 vendor/github.com/shirou/gopsutil/windows_memo.rst delete mode 100644 vendor/github.com/shirou/gopsutil/winservices/manager.go delete mode 100644 vendor/github.com/shirou/gopsutil/winservices/winservices.go delete mode 100644 vendor/github.com/shirou/w32/AUTHORS delete mode 100644 vendor/github.com/shirou/w32/LICENSE delete mode 100644 vendor/github.com/shirou/w32/README.md delete mode 100644 vendor/github.com/shirou/w32/advapi32.go delete mode 100644 vendor/github.com/shirou/w32/comctl32.go delete mode 100644 vendor/github.com/shirou/w32/comdlg32.go delete mode 100644 vendor/github.com/shirou/w32/constants.go delete mode 100644 vendor/github.com/shirou/w32/dwmapi.go delete mode 100644 vendor/github.com/shirou/w32/gdi32.go delete mode 100644 vendor/github.com/shirou/w32/gdiplus.go delete mode 100644 vendor/github.com/shirou/w32/idispatch.go delete mode 100644 vendor/github.com/shirou/w32/istream.go delete mode 100644 vendor/github.com/shirou/w32/iunknown.go delete mode 100644 vendor/github.com/shirou/w32/kernel32.go delete mode 100644 vendor/github.com/shirou/w32/ole32.go delete mode 100644 vendor/github.com/shirou/w32/oleaut32.go delete mode 100644 vendor/github.com/shirou/w32/opengl32.go delete mode 100644 vendor/github.com/shirou/w32/psapi.go delete mode 100644 vendor/github.com/shirou/w32/shell32.go delete mode 100644 vendor/github.com/shirou/w32/typedef.go delete mode 100644 vendor/github.com/shirou/w32/user32.go delete mode 100644 vendor/github.com/shirou/w32/utils.go delete mode 100644 vendor/github.com/shirou/w32/vars.go create mode 100644 vendor/github.com/sirupsen/logrus/.gitignore create mode 100644 vendor/github.com/sirupsen/logrus/.travis.yml create mode 100644 vendor/github.com/sirupsen/logrus/appveyor.yml rename vendor/github.com/sirupsen/logrus/{terminal => }/terminal_check_bsd.go (80%) delete mode 100644 vendor/github.com/sirupsen/logrus/terminal_check_js.go create mode 100644 vendor/github.com/sirupsen/logrus/terminal_check_no_terminal.go create mode 100644 vendor/github.com/sirupsen/logrus/terminal_check_solaris.go rename vendor/github.com/sirupsen/logrus/{terminal => }/terminal_check_unix.go (77%) delete mode 100644 vendor/github.com/sirupsen/logrus/terminal_notwindows.go delete mode 100644 vendor/github.com/sirupsen/logrus/terminal_windows.go create mode 100644 vendor/github.com/spf13/cobra/.gitignore create mode 100644 vendor/github.com/spf13/cobra/.mailmap create mode 100644 vendor/github.com/spf13/cobra/.travis.yml create mode 100644 vendor/github.com/spf13/pflag/.gitignore create mode 100644 vendor/github.com/spf13/pflag/.travis.yml create mode 100644 vendor/github.com/spf13/pflag/bytes.go create mode 100644 vendor/github.com/spf13/pflag/duration_slice.go create mode 100644 vendor/github.com/spf13/pflag/int16.go create mode 100644 vendor/github.com/spf13/pflag/string_to_int.go create mode 100644 vendor/github.com/spf13/pflag/string_to_string.go create mode 100644 vendor/github.com/stretchr/objx/.codeclimate.yml create mode 100644 vendor/github.com/stretchr/objx/.gitignore create mode 100644 vendor/github.com/stretchr/objx/.travis.yml create mode 100644 vendor/github.com/stretchr/objx/Taskfile.yml create mode 100644 vendor/github.com/stretchr/testify/assert/assertion_order.go create mode 100644 vendor/github.com/tsg/go-daemon/.gitignore create mode 100644 vendor/github.com/tsg/go-daemon/daemon.go create mode 100644 vendor/github.com/tsg/go-daemon/go.mod rename vendor/github.com/tsg/go-daemon/{ => src}/god.c (100%) create mode 100644 vendor/github.com/tsg/gopacket/.gitignore create mode 100644 vendor/github.com/tsg/gopacket/.travis.gofmt.sh create mode 100644 vendor/github.com/tsg/gopacket/.travis.govet.sh create mode 100644 vendor/github.com/tsg/gopacket/.travis.yml mode change 100755 => 100644 vendor/github.com/tsg/gopacket/gc delete mode 100644 vendor/github.com/tsg/gopacket/layers/gen.go mode change 100755 => 100644 vendor/github.com/tsg/gopacket/layers/test_creator.py delete mode 100644 vendor/github.com/tsg/gopacket/pfring/doc.go delete mode 100644 vendor/github.com/tsg/gopacket/pfring/pfring.go create mode 100644 vendor/github.com/urso/go-bin/.gitignore create mode 100644 vendor/github.com/urso/go-bin/bin.yml create mode 100644 vendor/github.com/urso/go-bin/bin_test.yml create mode 100644 vendor/github.com/urso/go-bin/types.yml delete mode 100644 vendor/github.com/urso/qcgen/LICENSE delete mode 100644 vendor/github.com/urso/qcgen/README.md delete mode 100644 vendor/github.com/urso/qcgen/helpers.go delete mode 100644 vendor/github.com/urso/qcgen/qcgen.go create mode 100644 vendor/github.com/vmware/govmomi/.drone.sec create mode 100644 vendor/github.com/vmware/govmomi/.drone.yml create mode 100644 vendor/github.com/vmware/govmomi/.gitignore create mode 100644 vendor/github.com/vmware/govmomi/.mailmap create mode 100644 vendor/github.com/vmware/govmomi/.travis.yml delete mode 100644 vendor/github.com/vmware/govmomi/ovf/cim.go delete mode 100644 vendor/github.com/vmware/govmomi/ovf/doc.go delete mode 100644 vendor/github.com/vmware/govmomi/ovf/env.go delete mode 100644 vendor/github.com/vmware/govmomi/ovf/envelope.go delete mode 100644 vendor/github.com/vmware/govmomi/ovf/manager.go delete mode 100644 vendor/github.com/vmware/govmomi/ovf/ovf.go delete mode 100644 vendor/github.com/weppos/publicsuffix-go/LICENSE.txt delete mode 100644 vendor/github.com/weppos/publicsuffix-go/publicsuffix/publicsuffix.go delete mode 100644 vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go create mode 100644 vendor/github.com/xanzy/go-gitlab/.gitignore create mode 100644 vendor/github.com/xanzy/go-gitlab/.travis.yml create mode 100644 vendor/github.com/xanzy/go-gitlab/CHANGELOG.md rename vendor/github.com/{docker/libnetwork => xanzy/go-gitlab}/LICENSE (100%) create mode 100644 vendor/github.com/xanzy/go-gitlab/README.md create mode 100644 vendor/github.com/xanzy/go-gitlab/access_requests.go create mode 100644 vendor/github.com/xanzy/go-gitlab/award_emojis.go create mode 100644 vendor/github.com/xanzy/go-gitlab/boards.go create mode 100644 vendor/github.com/xanzy/go-gitlab/branches.go create mode 100644 vendor/github.com/xanzy/go-gitlab/broadcast_messages.go create mode 100644 vendor/github.com/xanzy/go-gitlab/ci_yml_templates.go create mode 100644 vendor/github.com/xanzy/go-gitlab/commits.go create mode 100644 vendor/github.com/xanzy/go-gitlab/custom_attributes.go create mode 100644 vendor/github.com/xanzy/go-gitlab/deploy_keys.go create mode 100644 vendor/github.com/xanzy/go-gitlab/deployments.go create mode 100644 vendor/github.com/xanzy/go-gitlab/discussions.go create mode 100644 vendor/github.com/xanzy/go-gitlab/environments.go create mode 100644 vendor/github.com/xanzy/go-gitlab/epics.go create mode 100644 vendor/github.com/xanzy/go-gitlab/event_parsing.go create mode 100644 vendor/github.com/xanzy/go-gitlab/event_types.go create mode 100644 vendor/github.com/xanzy/go-gitlab/events.go create mode 100644 vendor/github.com/xanzy/go-gitlab/feature_flags.go create mode 100644 vendor/github.com/xanzy/go-gitlab/gitignore_templates.go create mode 100644 vendor/github.com/xanzy/go-gitlab/gitlab.go create mode 100644 vendor/github.com/xanzy/go-gitlab/go.mod create mode 100644 vendor/github.com/xanzy/go-gitlab/go.sum create mode 100644 vendor/github.com/xanzy/go-gitlab/group_badges.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_boards.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_clusters.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_labels.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_members.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_milestones.go create mode 100644 vendor/github.com/xanzy/go-gitlab/group_variables.go create mode 100644 vendor/github.com/xanzy/go-gitlab/groups.go create mode 100644 vendor/github.com/xanzy/go-gitlab/issue_links.go create mode 100644 vendor/github.com/xanzy/go-gitlab/issues.go create mode 100644 vendor/github.com/xanzy/go-gitlab/jobs.go create mode 100644 vendor/github.com/xanzy/go-gitlab/keys.go create mode 100644 vendor/github.com/xanzy/go-gitlab/labels.go create mode 100644 vendor/github.com/xanzy/go-gitlab/license.go create mode 100644 vendor/github.com/xanzy/go-gitlab/license_templates.go create mode 100644 vendor/github.com/xanzy/go-gitlab/merge_request_approvals.go create mode 100644 vendor/github.com/xanzy/go-gitlab/merge_requests.go create mode 100644 vendor/github.com/xanzy/go-gitlab/milestones.go create mode 100644 vendor/github.com/xanzy/go-gitlab/namespaces.go create mode 100644 vendor/github.com/xanzy/go-gitlab/notes.go create mode 100644 vendor/github.com/xanzy/go-gitlab/notifications.go create mode 100644 vendor/github.com/xanzy/go-gitlab/pages_domains.go create mode 100644 vendor/github.com/xanzy/go-gitlab/pipeline_schedules.go create mode 100644 vendor/github.com/xanzy/go-gitlab/pipeline_triggers.go create mode 100644 vendor/github.com/xanzy/go-gitlab/pipelines.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_badges.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_clusters.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_import_export.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_members.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_snippets.go create mode 100644 vendor/github.com/xanzy/go-gitlab/project_variables.go create mode 100644 vendor/github.com/xanzy/go-gitlab/projects.go create mode 100644 vendor/github.com/xanzy/go-gitlab/protected_branches.go create mode 100644 vendor/github.com/xanzy/go-gitlab/protected_tags.go create mode 100644 vendor/github.com/xanzy/go-gitlab/registry.go create mode 100644 vendor/github.com/xanzy/go-gitlab/releaselinks.go create mode 100644 vendor/github.com/xanzy/go-gitlab/releases.go create mode 100644 vendor/github.com/xanzy/go-gitlab/repositories.go create mode 100644 vendor/github.com/xanzy/go-gitlab/repository_files.go create mode 100644 vendor/github.com/xanzy/go-gitlab/resource_label_events.go create mode 100644 vendor/github.com/xanzy/go-gitlab/runners.go create mode 100644 vendor/github.com/xanzy/go-gitlab/search.go create mode 100644 vendor/github.com/xanzy/go-gitlab/services.go create mode 100644 vendor/github.com/xanzy/go-gitlab/settings.go create mode 100644 vendor/github.com/xanzy/go-gitlab/sidekiq_metrics.go create mode 100644 vendor/github.com/xanzy/go-gitlab/snippets.go create mode 100644 vendor/github.com/xanzy/go-gitlab/strings.go create mode 100644 vendor/github.com/xanzy/go-gitlab/system_hooks.go create mode 100644 vendor/github.com/xanzy/go-gitlab/tags.go create mode 100644 vendor/github.com/xanzy/go-gitlab/time_stats.go create mode 100644 vendor/github.com/xanzy/go-gitlab/todos.go create mode 100644 vendor/github.com/xanzy/go-gitlab/users.go create mode 100644 vendor/github.com/xanzy/go-gitlab/validate.go create mode 100644 vendor/github.com/xanzy/go-gitlab/version.go create mode 100644 vendor/github.com/xanzy/go-gitlab/wikis.go delete mode 100644 vendor/github.com/xdg/scram/LICENSE delete mode 100644 vendor/github.com/xdg/scram/README.md delete mode 100644 vendor/github.com/xdg/scram/client.go delete mode 100644 vendor/github.com/xdg/scram/client_conv.go delete mode 100644 vendor/github.com/xdg/scram/common.go delete mode 100644 vendor/github.com/xdg/scram/doc.go delete mode 100644 vendor/github.com/xdg/scram/parse.go delete mode 100644 vendor/github.com/xdg/scram/scram.go delete mode 100644 vendor/github.com/xdg/scram/server.go delete mode 100644 vendor/github.com/xdg/scram/server_conv.go delete mode 100644 vendor/github.com/xdg/stringprep/LICENSE delete mode 100644 vendor/github.com/xdg/stringprep/README.md delete mode 100644 vendor/github.com/xdg/stringprep/bidi.go delete mode 100644 vendor/github.com/xdg/stringprep/doc.go delete mode 100644 vendor/github.com/xdg/stringprep/error.go delete mode 100644 vendor/github.com/xdg/stringprep/map.go delete mode 100644 vendor/github.com/xdg/stringprep/profile.go delete mode 100644 vendor/github.com/xdg/stringprep/saslprep.go delete mode 100644 vendor/github.com/xdg/stringprep/set.go delete mode 100644 vendor/github.com/xdg/stringprep/tables.go create mode 100644 vendor/github.com/yuin/gopher-lua/.travis.yml create mode 100644 vendor/github.com/yuin/gopher-lua/parse/Makefile create mode 100644 vendor/github.com/yuin/gopher-lua/parse/parser.go.y delete mode 100644 vendor/github.com/zmap/zlint/LICENSE delete mode 100644 vendor/github.com/zmap/zlint/README.md delete mode 100644 vendor/github.com/zmap/zlint/go.mod delete mode 100644 vendor/github.com/zmap/zlint/go.sum delete mode 100644 vendor/github.com/zmap/zlint/lints/base.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_basic_constraints_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_common_name_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_country_name_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_country_name_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_crl_sign_not_set.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_digital_signature_not_set.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_is_ca.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_key_cert_sign_not_set.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_key_usage_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_key_usage_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_organization_name_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ca_subject_field_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_dv_conflicts_with_locality.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_dv_conflicts_with_org.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_dv_conflicts_with_postal.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_dv_conflicts_with_province.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_dv_conflicts_with_street.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_iv_requires_personal_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cab_ov_requires_org.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_contains_unique_identifier.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_extensions_version_not_3.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_policy_iv_requires_country.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_policy_iv_requires_province_or_locality.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_policy_ov_requires_country.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_policy_ov_requires_province_or_locality.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_cert_unique_identifier_version_not_2_or_3.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ct_sct_policy_count_unsatisfied.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dh_params_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_distribution_point_incomplete.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_distribution_point_missing_ldap_or_uri.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_bad_character_in_label.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_check_left_label_wildcard.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_contains_bare_iana_suffix.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_contains_empty_label.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_hyphen_in_sld.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_label_too_long.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_right_label_valid_tld.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_underscore_in_sld.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_underscore_in_trd.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_wildcard_left_of_public_suffix.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dnsname_wildcard_only_in_left_label.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dsa_correct_order_in_subgroup.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dsa_improper_modulus_or_divisor_size.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dsa_shorter_than_2048_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_dsa_unique_correct_representation.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ec_improper_curves.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ecdsa_ee_invalid_ku.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_eku_critical_improperly.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ev_business_category_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ev_country_name_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ev_organization_name_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ev_serial_number_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ev_valid_time_too_long.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_aia_access_location_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_aia_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_authority_key_identifier_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_authority_key_identifier_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_authority_key_identifier_no_key_identifier.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_contains_noticeref.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_disallowed_any_policy_qualifier.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_duplicate.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_explicit_text_ia5_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_explicit_text_includes_control.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_explicit_text_not_nfc.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_explicit_text_not_utf8.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_cert_policy_explicit_text_too_long.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_crl_distribution_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_duplicate_extension.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_freshest_crl_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_dns_not_ia5_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_empty_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_no_entries.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_rfc822_format_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_space_dns_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_uri_format_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_uri_host_not_fqdn_or_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_uri_not_ia5.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_ian_uri_relative.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_key_usage_cert_sign_without_ca.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_key_usage_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_key_usage_without_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_name_constraints_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_name_constraints_not_in_ca.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_policy_constraints_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_policy_constraints_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_policy_map_any_policy.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_policy_map_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_policy_map_not_in_cert_policy.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_contains_reserved_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_critical_with_subject_dn.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_directory_name_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_dns_name_too_long.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_dns_not_ia5_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_edi_party_name_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_empty_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_no_entries.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_not_critical_without_subject.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_other_name_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_registered_id_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_rfc822_format_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_rfc822_name_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_space_dns_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_uniform_resource_identifier_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_uri_format_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_uri_host_not_fqdn_or_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_uri_not_ia5.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_san_uri_relative.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_subject_directory_attr_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_subject_key_identifier_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_subject_key_identifier_missing_ca.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_subject_key_identifier_missing_sub_cert.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ext_tor_service_descriptor_hash_invalid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_generalized_time_does_not_include_seconds.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_generalized_time_includes_fraction_seconds.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_generalized_time_not_in_zulu.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ian_bare_wildcard.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ian_dns_name_includes_null_char.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ian_dns_name_starts_with_period.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ian_iana_pub_suffix_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_ian_wildcard_not_first.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_idn_dnsname_malformed_unicode.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_idn_dnsname_must_be_nfc.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_inhibit_any_policy_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_invalid_certificate_version.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_is_redacted_cert.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_issuer_dn_country_not_printable_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_issuer_dn_leading_whitespace.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_issuer_dn_trailing_whitespace.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_issuer_field_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_issuer_multiple_rdn.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_maximum_not_absent.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_minimum_non_zero.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_on_edi_party_name.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_on_registered_id.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_name_constraint_on_x400.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_old_root_ca_rsa_mod_less_than_2048_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_old_sub_ca_rsa_mod_less_than_1024_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_old_sub_cert_rsa_mod_less_than_1024_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_onion_subject_validity_time_too_large.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_path_len_constraint_improperly_included.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_path_len_constraint_zero_or_less.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_public_key_type_not_allowed.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_etsi_present_qcs_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_etsi_type_as_statem.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_mandatory_etsi_statems.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qccompliance_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qclimitvalue_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qcpds_lang_case.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qcpds_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qcretentionperiod_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qcsscd_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qctype_valid.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_qcstatem_qctype_web.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_root_ca_basic_constraints_path_len_constraint_field_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_root_ca_contains_cert_policy.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_root_ca_extended_key_usage_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_root_ca_key_usage_must_be_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_root_ca_key_usage_present.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_exp_negative.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_mod_factors_smaller_than_752_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_mod_less_than_2048_bits.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_mod_not_odd.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_no_public_key.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_public_exponent_not_in_range.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_public_exponent_not_odd.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_rsa_public_exponent_too_small.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_bare_wildcard.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_dns_name_duplicate.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_dns_name_includes_null_char.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_dns_name_onion_not_ev_cert.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_dns_name_starts_with_period.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_iana_pub_suffix_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_san_wildcard_not_first.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_serial_number_longer_than_20_octets.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_serial_number_not_positive.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_signature_algorithm_not_supported.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_spki_rsa_encryption_parameter_not_null.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_aia_does_not_contain_issuing_ca_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_aia_does_not_contain_ocsp_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_aia_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_aia_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_certificate_policies_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_certificate_policies_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_crl_distribution_points_does_not_contain_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_crl_distribution_points_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_crl_distribution_points_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_eku_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_eku_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_eku_valid_fields.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_ca_name_constraints_not_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_aia_does_not_contain_issuing_ca_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_aia_does_not_contain_ocsp_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_aia_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_aia_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_cert_policy_empty.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_certificate_policies_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_certificate_policies_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_country_name_must_appear.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_crl_distribution_points_does_not_contain_url.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_crl_distribution_points_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_eku_extra_values.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_eku_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_eku_server_auth_client_auth_missing.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_gn_sn_contains_policy.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_is_ca.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_key_usage_cert_sign_bit_set.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_key_usage_crl_sign_bit_set.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_locality_name_must_appear.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_locality_name_must_not_appear.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_or_sub_ca_using_sha1.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_postal_code_prohibited.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_province_must_appear.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_province_must_not_appear.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_sha1_expiration_too_long.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_street_address_should_not_exist.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_valid_time_longer_than_39_months.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_sub_cert_valid_time_longer_than_825_days.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_common_name_included.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_common_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_common_name_not_from_san.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_contains_malformed_arpa_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_contains_noninformational_value.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_contains_reserved_arpa_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_contains_reserved_ip.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_country_not_iso.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_country_not_printable_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_leading_whitespace.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_not_printable_characters.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_serial_number_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_serial_number_not_printable_string.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_dn_trailing_whitespace.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_email_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_empty_without_san.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_given_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_info_access_marked_critical.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_locality_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_multiple_rdn.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_not_dn.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_organization_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_organizational_unit_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_postal_code_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_printable_string_badalpha.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_state_name_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_street_address_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_subject_surname_max_length.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_tbs_signature_rsa_encryption_parameter_not_null.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_utc_time_does_not_include_seconds.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_utc_time_not_in_zulu.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_validity_time_not_positive.go delete mode 100644 vendor/github.com/zmap/zlint/lints/lint_wrong_time_format_pre2050.go delete mode 100644 vendor/github.com/zmap/zlint/lints/result.go delete mode 100644 vendor/github.com/zmap/zlint/lints/testingUtil.go delete mode 100644 vendor/github.com/zmap/zlint/makefile delete mode 100755 vendor/github.com/zmap/zlint/newLint.sh delete mode 100644 vendor/github.com/zmap/zlint/template delete mode 100644 vendor/github.com/zmap/zlint/util/algorithm_identifier.go delete mode 100644 vendor/github.com/zmap/zlint/util/ca.go delete mode 100644 vendor/github.com/zmap/zlint/util/countries.go delete mode 100644 vendor/github.com/zmap/zlint/util/encodings.go delete mode 100644 vendor/github.com/zmap/zlint/util/ev.go delete mode 100644 vendor/github.com/zmap/zlint/util/fqdn.go delete mode 100644 vendor/github.com/zmap/zlint/util/gtld.go delete mode 100644 vendor/github.com/zmap/zlint/util/gtld_map.go delete mode 100644 vendor/github.com/zmap/zlint/util/ip.go delete mode 100644 vendor/github.com/zmap/zlint/util/ku.go delete mode 100644 vendor/github.com/zmap/zlint/util/names.go delete mode 100644 vendor/github.com/zmap/zlint/util/oid.go delete mode 100644 vendor/github.com/zmap/zlint/util/primes.go delete mode 100644 vendor/github.com/zmap/zlint/util/qc_stmt.go delete mode 100644 vendor/github.com/zmap/zlint/util/rdn.go delete mode 100644 vendor/github.com/zmap/zlint/util/time.go delete mode 100644 vendor/github.com/zmap/zlint/zlint.go create mode 100644 vendor/go.opencensus.io/.gitignore create mode 100644 vendor/go.opencensus.io/.travis.yml delete mode 100644 vendor/go.opencensus.io/Gopkg.lock delete mode 100644 vendor/go.opencensus.io/Gopkg.toml create mode 100644 vendor/go.opencensus.io/appveyor.yml delete mode 100644 vendor/go.opencensus.io/plugin/ochttp/propagation/tracecontext/propagation.go create mode 100644 vendor/go.uber.org/atomic/.codecov.yml create mode 100644 vendor/go.uber.org/atomic/.gitignore create mode 100644 vendor/go.uber.org/atomic/.travis.yml create mode 100644 vendor/go.uber.org/multierr/.codecov.yml create mode 100644 vendor/go.uber.org/multierr/.gitignore create mode 100644 vendor/go.uber.org/multierr/.travis.yml create mode 100644 vendor/go.uber.org/zap/.codecov.yml create mode 100644 vendor/go.uber.org/zap/.gitignore create mode 100644 vendor/go.uber.org/zap/.readme.tmpl create mode 100644 vendor/go.uber.org/zap/.travis.yml create mode 100644 vendor/golang.org/x/crypto/AUTHORS create mode 100644 vendor/golang.org/x/crypto/CONTRIBUTORS delete mode 100644 vendor/golang.org/x/crypto/cryptobyte/asn1.go delete mode 100644 vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go delete mode 100644 vendor/golang.org/x/crypto/cryptobyte/builder.go delete mode 100644 vendor/golang.org/x/crypto/cryptobyte/string.go delete mode 100644 vendor/golang.org/x/crypto/ocsp/ocsp.go create mode 100644 vendor/golang.org/x/exp/AUTHORS create mode 100644 vendor/golang.org/x/exp/CONTRIBUTORS rename vendor/{github.com/ishidawataru/sctp/GO_LICENSE => golang.org/x/exp/LICENSE} (100%) create mode 100644 vendor/golang.org/x/exp/PATENTS create mode 100644 vendor/golang.org/x/exp/apidiff/README.md create mode 100644 vendor/golang.org/x/exp/apidiff/apidiff.go create mode 100644 vendor/golang.org/x/exp/apidiff/compatibility.go create mode 100644 vendor/golang.org/x/exp/apidiff/correspondence.go create mode 100644 vendor/golang.org/x/exp/apidiff/messageset.go create mode 100644 vendor/golang.org/x/exp/apidiff/report.go create mode 100644 vendor/golang.org/x/exp/cmd/apidiff/main.go create mode 100644 vendor/golang.org/x/lint/.travis.yml create mode 100644 vendor/golang.org/x/lint/CONTRIBUTING.md create mode 100644 vendor/golang.org/x/lint/LICENSE create mode 100644 vendor/golang.org/x/lint/README.md create mode 100644 vendor/golang.org/x/lint/go.mod create mode 100644 vendor/golang.org/x/lint/go.sum create mode 100644 vendor/golang.org/x/lint/golint/golint.go create mode 100644 vendor/golang.org/x/lint/golint/import.go create mode 100644 vendor/golang.org/x/lint/golint/importcomment.go create mode 100644 vendor/golang.org/x/lint/lint.go create mode 100644 vendor/golang.org/x/net/AUTHORS create mode 100644 vendor/golang.org/x/net/CONTRIBUTORS create mode 100644 vendor/golang.org/x/net/http2/.gitignore create mode 100644 vendor/golang.org/x/net/idna/tables12.00.go create mode 100644 vendor/golang.org/x/net/internal/socket/norace.go create mode 100644 vendor/golang.org/x/net/internal/socket/race.go create mode 100644 vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go create mode 100644 vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go create mode 100644 vendor/golang.org/x/oauth2/.travis.yml create mode 100644 vendor/golang.org/x/sync/AUTHORS create mode 100644 vendor/golang.org/x/sync/CONTRIBUTORS create mode 100644 vendor/golang.org/x/sys/AUTHORS create mode 100644 vendor/golang.org/x/sys/CONTRIBUTORS create mode 100644 vendor/golang.org/x/sys/cpu/cpu_arm64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_arm64.s create mode 100644 vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go rename vendor/golang.org/x/sys/cpu/{cpu_gccgo.c => cpu_gccgo_x86.c} (100%) rename vendor/golang.org/x/sys/cpu/{cpu_gccgo.go => cpu_gccgo_x86.go} (100%) create mode 100644 vendor/golang.org/x/sys/cpu/cpu_linux_arm.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go create mode 100644 vendor/golang.org/x/sys/cpu/cpu_riscv64.go create mode 100644 vendor/golang.org/x/sys/cpu/hwcap_linux.go create mode 100644 vendor/golang.org/x/sys/unix/.gitignore create mode 100644 vendor/golang.org/x/sys/unix/fdset.go mode change 100755 => 100644 vendor/golang.org/x/sys/unix/mkall.sh mode change 100755 => 100644 vendor/golang.org/x/sys/unix/mkerrors.sh create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_386.1_11.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_amd64.1_11.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm64.1_11.go delete mode 100644 vendor/golang.org/x/sys/unix/zptrace386_linux.go create mode 100644 vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go create mode 100644 vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go create mode 100644 vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go create mode 100644 vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go create mode 100644 vendor/golang.org/x/sys/unix/zptrace_x86_linux.go delete mode 100644 vendor/golang.org/x/sys/unix/zptracearm_linux.go delete mode 100644 vendor/golang.org/x/sys/unix/zptracemips_linux.go delete mode 100644 vendor/golang.org/x/sys/unix/zptracemipsle_linux.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.s create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s delete mode 100644 vendor/golang.org/x/sys/windows/asm_windows_386.s delete mode 100644 vendor/golang.org/x/sys/windows/asm_windows_amd64.s delete mode 100644 vendor/golang.org/x/sys/windows/asm_windows_arm.s create mode 100644 vendor/golang.org/x/sys/windows/empty.s mode change 100755 => 100644 vendor/golang.org/x/sys/windows/mkerrors.bash mode change 100755 => 100644 vendor/golang.org/x/sys/windows/mkknownfolderids.bash delete mode 100644 vendor/golang.org/x/sys/windows/svc/mgr/config.go delete mode 100644 vendor/golang.org/x/sys/windows/svc/mgr/mgr.go delete mode 100644 vendor/golang.org/x/sys/windows/svc/mgr/recovery.go delete mode 100644 vendor/golang.org/x/sys/windows/svc/mgr/service.go delete mode 100644 vendor/golang.org/x/text/CONTRIBUTING.md delete mode 100644 vendor/golang.org/x/text/README.md delete mode 100644 vendor/golang.org/x/text/codereview.cfg delete mode 100644 vendor/golang.org/x/text/doc.go delete mode 100644 vendor/golang.org/x/text/go.mod delete mode 100644 vendor/golang.org/x/text/go.sum create mode 100644 vendor/golang.org/x/time/AUTHORS create mode 100644 vendor/golang.org/x/time/CONTRIBUTORS create mode 100644 vendor/golang.org/x/tools/AUTHORS create mode 100644 vendor/golang.org/x/tools/CONTRIBUTORS create mode 100644 vendor/golang.org/x/tools/cmd/stringer/stringer.go create mode 100644 vendor/golang.org/x/tools/go/analysis/analysis.go create mode 100644 vendor/golang.org/x/tools/go/analysis/diagnostic.go create mode 100644 vendor/golang.org/x/tools/go/analysis/doc.go create mode 100644 vendor/golang.org/x/tools/go/analysis/passes/inspect/inspect.go create mode 100644 vendor/golang.org/x/tools/go/analysis/validate.go create mode 100644 vendor/golang.org/x/tools/go/ast/inspector/inspector.go create mode 100644 vendor/golang.org/x/tools/go/ast/inspector/typeof.go delete mode 100644 vendor/golang.org/x/tools/go/internal/cgo/cgo.go delete mode 100644 vendor/golang.org/x/tools/go/internal/cgo/cgo_pkgconfig.go delete mode 100644 vendor/golang.org/x/tools/go/loader/doc.go delete mode 100644 vendor/golang.org/x/tools/go/loader/loader.go delete mode 100644 vendor/golang.org/x/tools/go/loader/util.go create mode 100644 vendor/golang.org/x/tools/go/packages/loadmode_string.go create mode 100644 vendor/golang.org/x/tools/go/types/objectpath/objectpath.go create mode 100644 vendor/golang.org/x/tools/go/types/typeutil/callee.go create mode 100644 vendor/golang.org/x/tools/go/types/typeutil/imports.go create mode 100644 vendor/golang.org/x/tools/go/types/typeutil/map.go create mode 100644 vendor/golang.org/x/tools/go/types/typeutil/methodsetcache.go create mode 100644 vendor/golang.org/x/tools/go/types/typeutil/ui.go delete mode 100644 vendor/golang.org/x/tools/imports/forward.go create mode 100644 vendor/google.golang.org/api/AUTHORS create mode 100644 vendor/google.golang.org/api/CONTRIBUTORS delete mode 100644 vendor/google.golang.org/api/gensupport/backoff.go delete mode 100644 vendor/google.golang.org/api/gensupport/buffer.go delete mode 100644 vendor/google.golang.org/api/gensupport/doc.go delete mode 100644 vendor/google.golang.org/api/gensupport/header.go delete mode 100644 vendor/google.golang.org/api/gensupport/json.go delete mode 100644 vendor/google.golang.org/api/gensupport/jsonfloat.go delete mode 100644 vendor/google.golang.org/api/gensupport/media.go delete mode 100644 vendor/google.golang.org/api/gensupport/params.go delete mode 100644 vendor/google.golang.org/api/gensupport/resumable.go delete mode 100644 vendor/google.golang.org/api/gensupport/retry.go delete mode 100644 vendor/google.golang.org/api/gensupport/send.go delete mode 100644 vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE delete mode 100644 vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go delete mode 100644 vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go create mode 100644 vendor/google.golang.org/appengine/.travis.yml delete mode 100644 vendor/google.golang.org/appengine/datastore/datastore.go delete mode 100644 vendor/google.golang.org/appengine/datastore/doc.go delete mode 100644 vendor/google.golang.org/appengine/datastore/internal/cloudkey/cloudkey.go delete mode 100644 vendor/google.golang.org/appengine/datastore/internal/cloudpb/entity.pb.go delete mode 100644 vendor/google.golang.org/appengine/datastore/key.go delete mode 100644 vendor/google.golang.org/appengine/datastore/keycompat.go delete mode 100644 vendor/google.golang.org/appengine/datastore/load.go delete mode 100644 vendor/google.golang.org/appengine/datastore/metadata.go delete mode 100644 vendor/google.golang.org/appengine/datastore/prop.go delete mode 100644 vendor/google.golang.org/appengine/datastore/query.go delete mode 100644 vendor/google.golang.org/appengine/datastore/save.go delete mode 100644 vendor/google.golang.org/appengine/datastore/transaction.go mode change 100755 => 100644 vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto mode change 100755 => 100644 vendor/google.golang.org/appengine/internal/regen.sh mode change 100755 => 100644 vendor/google.golang.org/appengine/travis_install.sh mode change 100755 => 100644 vendor/google.golang.org/appengine/travis_test.sh delete mode 100644 vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/datastore/v1/datastore.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/datastore/v1/entity.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/datastore/v1/query.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/type/latlng/latlng.pb.go create mode 100644 vendor/google.golang.org/grpc/.travis.yml create mode 100644 vendor/google.golang.org/grpc/attributes/attributes.go mode change 100755 => 100644 vendor/google.golang.org/grpc/balancer/grpclb/regenerate.sh mode change 100755 => 100644 vendor/google.golang.org/grpc/codegen.sh mode change 100755 => 100644 vendor/google.golang.org/grpc/credentials/alts/internal/regenerate.sh rename vendor/google.golang.org/grpc/credentials/{tls13.go => go12.go} (100%) create mode 100644 vendor/google.golang.org/grpc/credentials/tls.go mode change 100755 => 100644 vendor/google.golang.org/grpc/install_gae.sh mode change 100755 => 100644 vendor/google.golang.org/grpc/internal/binarylog/regenerate.sh create mode 100644 vendor/google.golang.org/grpc/internal/resolver/dns/go113.go delete mode 100644 vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go delete mode 100644 vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go mode change 100755 => 100644 vendor/google.golang.org/grpc/vet.sh delete mode 100644 vendor/gopkg.in/hjson/hjson-go.v3/LICENSE delete mode 100644 vendor/gopkg.in/hjson/hjson-go.v3/README.md delete mode 100755 vendor/gopkg.in/hjson/hjson-go.v3/build_release.sh delete mode 100644 vendor/gopkg.in/hjson/hjson-go.v3/decode.go delete mode 100644 vendor/gopkg.in/hjson/hjson-go.v3/encode.go delete mode 100644 vendor/gopkg.in/hjson/hjson-go.v3/parseNumber.go create mode 100644 vendor/gopkg.in/jcmturner/aescts.v1/.gitignore create mode 100644 vendor/gopkg.in/jcmturner/dnsutils.v1/.gitignore create mode 100644 vendor/gopkg.in/jcmturner/dnsutils.v1/.travis.yml create mode 100644 vendor/gopkg.in/mgo.v2/.travis.yml create mode 100644 vendor/gopkg.in/yaml.v2/.travis.yml create mode 100644 vendor/honnef.co/go/tools/LICENSE create mode 100644 vendor/honnef.co/go/tools/LICENSE-THIRD-PARTY create mode 100644 vendor/honnef.co/go/tools/arg/arg.go create mode 100644 vendor/honnef.co/go/tools/cmd/staticcheck/README.md create mode 100644 vendor/honnef.co/go/tools/cmd/staticcheck/staticcheck.go create mode 100644 vendor/honnef.co/go/tools/config/config.go create mode 100644 vendor/honnef.co/go/tools/config/example.conf create mode 100644 vendor/honnef.co/go/tools/deprecated/stdlib.go create mode 100644 vendor/honnef.co/go/tools/facts/deprecated.go create mode 100644 vendor/honnef.co/go/tools/facts/generated.go create mode 100644 vendor/honnef.co/go/tools/facts/purity.go create mode 100644 vendor/honnef.co/go/tools/facts/token.go create mode 100644 vendor/honnef.co/go/tools/functions/loops.go create mode 100644 vendor/honnef.co/go/tools/functions/pure.go create mode 100644 vendor/honnef.co/go/tools/functions/terminates.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/callee.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/identical.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/imports.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/map.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/methodsetcache.go create mode 100644 vendor/honnef.co/go/tools/go/types/typeutil/ui.go create mode 100644 vendor/honnef.co/go/tools/internal/cache/cache.go create mode 100644 vendor/honnef.co/go/tools/internal/cache/default.go create mode 100644 vendor/honnef.co/go/tools/internal/cache/hash.go create mode 100644 vendor/honnef.co/go/tools/internal/passes/buildssa/buildssa.go create mode 100644 vendor/honnef.co/go/tools/internal/renameio/renameio.go create mode 100644 vendor/honnef.co/go/tools/internal/sharedcheck/lint.go create mode 100644 vendor/honnef.co/go/tools/lint/LICENSE create mode 100644 vendor/honnef.co/go/tools/lint/lint.go create mode 100644 vendor/honnef.co/go/tools/lint/lintdsl/lintdsl.go create mode 100644 vendor/honnef.co/go/tools/lint/lintutil/format/format.go create mode 100644 vendor/honnef.co/go/tools/lint/lintutil/stats.go create mode 100644 vendor/honnef.co/go/tools/lint/lintutil/stats_bsd.go create mode 100644 vendor/honnef.co/go/tools/lint/lintutil/stats_posix.go create mode 100644 vendor/honnef.co/go/tools/lint/lintutil/util.go create mode 100644 vendor/honnef.co/go/tools/lint/runner.go create mode 100644 vendor/honnef.co/go/tools/lint/stats.go create mode 100644 vendor/honnef.co/go/tools/loader/loader.go create mode 100644 vendor/honnef.co/go/tools/printf/fuzz.go create mode 100644 vendor/honnef.co/go/tools/printf/printf.go create mode 100644 vendor/honnef.co/go/tools/simple/CONTRIBUTING.md create mode 100644 vendor/honnef.co/go/tools/simple/analysis.go create mode 100644 vendor/honnef.co/go/tools/simple/doc.go create mode 100644 vendor/honnef.co/go/tools/simple/lint.go create mode 100644 vendor/honnef.co/go/tools/ssa/LICENSE create mode 100644 vendor/honnef.co/go/tools/ssa/blockopt.go create mode 100644 vendor/honnef.co/go/tools/ssa/builder.go create mode 100644 vendor/honnef.co/go/tools/ssa/const.go create mode 100644 vendor/honnef.co/go/tools/ssa/create.go create mode 100644 vendor/honnef.co/go/tools/ssa/doc.go create mode 100644 vendor/honnef.co/go/tools/ssa/dom.go create mode 100644 vendor/honnef.co/go/tools/ssa/emit.go create mode 100644 vendor/honnef.co/go/tools/ssa/func.go create mode 100644 vendor/honnef.co/go/tools/ssa/identical.go create mode 100644 vendor/honnef.co/go/tools/ssa/identical_17.go create mode 100644 vendor/honnef.co/go/tools/ssa/lift.go create mode 100644 vendor/honnef.co/go/tools/ssa/lvalue.go create mode 100644 vendor/honnef.co/go/tools/ssa/methods.go create mode 100644 vendor/honnef.co/go/tools/ssa/mode.go create mode 100644 vendor/honnef.co/go/tools/ssa/print.go create mode 100644 vendor/honnef.co/go/tools/ssa/sanity.go create mode 100644 vendor/honnef.co/go/tools/ssa/source.go create mode 100644 vendor/honnef.co/go/tools/ssa/ssa.go create mode 100644 vendor/honnef.co/go/tools/ssa/staticcheck.conf create mode 100644 vendor/honnef.co/go/tools/ssa/testmain.go create mode 100644 vendor/honnef.co/go/tools/ssa/util.go create mode 100644 vendor/honnef.co/go/tools/ssa/wrappers.go create mode 100644 vendor/honnef.co/go/tools/ssa/write.go create mode 100644 vendor/honnef.co/go/tools/ssautil/ssautil.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/CONTRIBUTING.md create mode 100644 vendor/honnef.co/go/tools/staticcheck/analysis.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/buildtag.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/doc.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/knowledge.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/lint.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/rules.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/structtag.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/vrp/channel.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/vrp/int.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/vrp/slice.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/vrp/string.go create mode 100644 vendor/honnef.co/go/tools/staticcheck/vrp/vrp.go create mode 100644 vendor/honnef.co/go/tools/stylecheck/analysis.go create mode 100644 vendor/honnef.co/go/tools/stylecheck/doc.go create mode 100644 vendor/honnef.co/go/tools/stylecheck/lint.go create mode 100644 vendor/honnef.co/go/tools/stylecheck/names.go create mode 100644 vendor/honnef.co/go/tools/unused/edge.go create mode 100644 vendor/honnef.co/go/tools/unused/edgekind_string.go create mode 100644 vendor/honnef.co/go/tools/unused/implements.go create mode 100644 vendor/honnef.co/go/tools/unused/unused.go create mode 100644 vendor/honnef.co/go/tools/version/buildinfo.go create mode 100644 vendor/honnef.co/go/tools/version/buildinfo111.go create mode 100644 vendor/honnef.co/go/tools/version/version.go create mode 100644 vendor/howett.net/plist/.gitlab-ci.yml create mode 100644 vendor/howett.net/plist/go.mod create mode 100644 vendor/k8s.io/client-go/pkg/version/.gitattributes mode change 100755 => 100644 vendor/k8s.io/client-go/tools/cache/store.go create mode 100644 vendor/k8s.io/klog/.travis.yml create mode 100644 vendor/modules.txt delete mode 100644 vendor/pack.ag/amqp/CONTRIBUTING.md delete mode 100644 vendor/pack.ag/amqp/LICENSE delete mode 100644 vendor/pack.ag/amqp/Makefile delete mode 100644 vendor/pack.ag/amqp/README.md delete mode 100644 vendor/pack.ag/amqp/bitmap.go delete mode 100644 vendor/pack.ag/amqp/buffer.go delete mode 100644 vendor/pack.ag/amqp/client.go delete mode 100644 vendor/pack.ag/amqp/conn.go delete mode 100644 vendor/pack.ag/amqp/decode.go delete mode 100644 vendor/pack.ag/amqp/doc.go delete mode 100644 vendor/pack.ag/amqp/encode.go delete mode 100644 vendor/pack.ag/amqp/error_pkgerrors.go delete mode 100644 vendor/pack.ag/amqp/error_stdlib.go delete mode 100644 vendor/pack.ag/amqp/fuzz.go delete mode 100644 vendor/pack.ag/amqp/internal/testconn/recorder.go delete mode 100644 vendor/pack.ag/amqp/internal/testconn/testconn.go delete mode 100644 vendor/pack.ag/amqp/log.go delete mode 100644 vendor/pack.ag/amqp/log_debug.go delete mode 100644 vendor/pack.ag/amqp/sasl.go delete mode 100644 vendor/pack.ag/amqp/types.go create mode 100644 vendor/sigs.k8s.io/yaml/.gitignore create mode 100644 vendor/sigs.k8s.io/yaml/.travis.yml delete mode 100644 vendor/vendor.json diff --git a/.travis.yml b/.travis.yml index a3171ff70616..9c5eae3e17c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,23 +148,24 @@ jobs: stage: test # Generators - - os: linux - env: TARGETS="-C generator/metricbeat test test-package" - go: $TRAVIS_GO_VERSION - stage: test - - os: linux - env: TARGETS="-C generator/beat test test-package" - go: $TRAVIS_GO_VERSION - stage: test + # Temporarily disable generator jobs + #- os: linux + # env: TARGETS="-C generator/_templates/metricbeat test test-package" + # go: $TRAVIS_GO_VERSION + # stage: test + #- os: linux + # env: TARGETS="-C generator/_templates/beat test test-package" + # go: $TRAVIS_GO_VERSION + # stage: test - - os: osx - env: TARGETS="-C generator/metricbeat test" - go: $TRAVIS_GO_VERSION - stage: test - - os: osx - env: TARGETS="-C generator/beat test" - go: $TRAVIS_GO_VERSION - stage: test + #- os: osx + # env: TARGETS="-C generator/_templates/metricbeat test" + # go: $TRAVIS_GO_VERSION + # stage: test + #- os: osx + # env: TARGETS="-C generator/_templates/beat test" + # go: $TRAVIS_GO_VERSION + # stage: test # Kubernetes - os: linux diff --git a/Makefile b/Makefile index b10c298e0a58..f7262cc07017 100644 --- a/Makefile +++ b/Makefile @@ -81,12 +81,6 @@ clean: mage @$(MAKE) -C generator clean @-mage -clean -# Cleans up the vendor directory from unnecessary files -# This should always be run after updating the dependencies -.PHONY: clean-vendor -clean-vendor: - @sh script/clean_vendor.sh - .PHONY: check check: python-env @$(foreach var,$(PROJECTS) dev-tools $(PROJECTS_XPACK_MAGE),$(MAKE) -C $(var) check || exit 1;) @@ -95,6 +89,7 @@ check: python-env @# Validate that all updates were committed @$(MAKE) update @$(MAKE) check-headers + go mod tidy @git diff | cat @git update-index --refresh @git diff-index --exit-code HEAD -- diff --git a/NOTICE.txt b/NOTICE.txt index fbbaf70ad6df..7691f58a0946 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -9,9 +9,36 @@ Third party libraries used by the Elastic Beats project: ========================================================================== +-------------------------------------------------------------------- +Dependency: 4d63.com/embedfiles +Revision: 995e0740726f +License type (autodetected): MIT +./vendor/4d63.com/embedfiles/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2017, Leigh McCulloch + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + -------------------------------------------------------------------- Dependency: 4d63.com/tz -Revision: 6d37baae851b6f07225308b199322f70907aa3dd +Version: v1.1.1 +Revision: 6d37baae851b License type (autodetected): MIT ./vendor/4d63.com/tz/LICENSE: -------------------------------------------------------------------- @@ -71,17 +98,43 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: cloud.google.com/go -Version: v0.40.0 -Revision: 457ea5c15ccf3b87db582c450e80101989da35f7 +Version: v0.51.0 License type (autodetected): Apache-2.0 ./vendor/cloud.google.com/go/LICENSE: -------------------------------------------------------------------- Apache License 2.0 +-------------------------------------------------------------------- +Dependency: cloud.google.com/go/datastore +Version: v1.0.0 +License type (autodetected): Apache-2.0 +./vendor/cloud.google.com/go/datastore/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: cloud.google.com/go/pubsub +Version: v1.0.1 +License type (autodetected): Apache-2.0 +./vendor/cloud.google.com/go/pubsub/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: cloud.google.com/go/storage +Version: v1.0.0 +License type (autodetected): Apache-2.0 +./vendor/cloud.google.com/go/storage/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + -------------------------------------------------------------------- Dependency: code.cloudfoundry.org/go-diodes -Revision: f77fb823c7ee0156ed4cdadaf4f79ac3fd84613f +Revision: f77fb823c7ee License type (autodetected): Apache-2.0 ./vendor/code.cloudfoundry.org/go-diodes/LICENSE: -------------------------------------------------------------------- @@ -109,8 +162,7 @@ as noted in the LICENSE file. -------------------------------------------------------------------- Dependency: code.cloudfoundry.org/go-loggregator -Version: v7.7.0 -Revision: b8d176783c8a6280a34f0e19e0e8f57d722773a1 +Version: v7.4.0 License type (autodetected): Apache-2.0 ./vendor/code.cloudfoundry.org/go-loggregator/LICENSE: -------------------------------------------------------------------- @@ -136,7 +188,7 @@ limitations under the License. -------------------------------------------------------------------- Dependency: code.cloudfoundry.org/gofileutils -Revision: 4d0c80011a0f37da1711c184028bc40137cd45af +Revision: 4d0c80011a0f License type (autodetected): Apache-2.0 ./vendor/code.cloudfoundry.org/gofileutils/LICENSE: -------------------------------------------------------------------- @@ -157,7 +209,7 @@ conditions of the subcomponent's license, as noted in the LICENSE file. -------------------------------------------------------------------- Dependency: code.cloudfoundry.org/rfc5424 -Revision: 236a6d29298aea12f69978f33393d12465abc429 +Revision: 236a6d29298a License type (autodetected): BSD-2-Clause ./vendor/code.cloudfoundry.org/rfc5424/LICENSE: -------------------------------------------------------------------- @@ -187,18 +239,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -Dependency: contrib.go.opencensus.io/exporter/ocagent -Revision: 8110e6c0236bb231b19119275a6be6ec666d05c8 -License type (autodetected): Apache-2.0 -./vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/aerospike/aerospike-client-go -Revision: 0f3b54da6bdc2c31c505f9afbc5f434dd2089658 +Version: v1.27.1 +Revision: 0f3b54da6bdc License type (autodetected): Apache-2.0 ./vendor/github.com/aerospike/aerospike-client-go/LICENSE: -------------------------------------------------------------------- @@ -207,7 +251,6 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/aerospike/aerospike-client-go/pkg/bcrypt -Revision: 0f3b54da6bdc2c31c505f9afbc5f434dd2089658 License type (autodetected): BSD-3-Clause ./vendor/github.com/aerospike/aerospike-client-go/pkg/bcrypt/LICENSE: -------------------------------------------------------------------- @@ -243,7 +286,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/andrewkroh/sys -Revision: 287798fe3e430efeb9318b95ff52353aaa2b59b1 +Revision: 287798fe3e43 License type (autodetected): BSD-3-Clause ./vendor/github.com/andrewkroh/sys/LICENSE: -------------------------------------------------------------------- @@ -277,7 +320,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/armon/go-socks5 -Revision: e75332964ef517daa070d7c38a9466a0d687e0a5 +Revision: e75332964ef5 License type (autodetected): MIT ./vendor/github.com/armon/go-socks5/LICENSE: -------------------------------------------------------------------- @@ -304,8 +347,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/aws/aws-lambda-go -Version: =v1.6.0 -Revision: 2d482ef09017ae953b1e8d5a6ddac5b696663a3c +Version: v1.6.0 License type (autodetected): Apache-2.0 ./vendor/github.com/aws/aws-lambda-go/LICENSE: -------------------------------------------------------------------- @@ -314,8 +356,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/aws/aws-lambda-go -Version: =v1.6.0 -Revision: 2d482ef09017ae953b1e8d5a6ddac5b696663a3c +Version: v1.6.0 License type (autodetected): MIT ./vendor/github.com/aws/aws-lambda-go/LICENSE-LAMBDACODE: -------------------------------------------------------------------- @@ -338,27 +379,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/aws/aws-sdk-go-v2 Version: v0.9.0 -Revision: 098e15df3044cf1b04a222c1c33c3e6135ac89f3 License type (autodetected): Apache-2.0 ./vendor/github.com/aws/aws-sdk-go-v2/LICENSE.txt: -------------------------------------------------------------------- Apache License 2.0 - --------------------------------------------------------------------- -Dependency: github.com/awslabs/goformation -Version: v4.1.0 -Revision: 18ccd0e58e5df10d9f82f875d54b087d3058cfc1 -License type (autodetected): Apache-2.0 -./vendor/github.com/awslabs/goformation/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - +-------NOTICE.txt----- +AWS SDK for Go +Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2014-2015 Stripe, Inc. -------------------------------------------------------------------- Dependency: github.com/awslabs/goformation/v4 Version: v4.1.0 -Revision: 18ccd0e58e5df10d9f82f875d54b087d3058cfc1 License type (autodetected): Apache-2.0 ./vendor/github.com/awslabs/goformation/v4/LICENSE: -------------------------------------------------------------------- @@ -371,7 +404,6 @@ Copyright 2011-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. -------------------------------------------------------------------- Dependency: github.com/Azure/azure-amqp-common-go/v3 Version: v3.0.0 -Revision: af261efd31b6641d91d5c53cc4f9bc1e438f4e5a License type (autodetected): MIT ./vendor/github.com/Azure/azure-amqp-common-go/v3/LICENSE: -------------------------------------------------------------------- @@ -399,8 +431,7 @@ License type (autodetected): MIT -------------------------------------------------------------------- Dependency: github.com/Azure/azure-event-hubs-go/v3 -Version: v3.0.0 -Revision: 7a1b2e2089e284bcec716b3bdc64ee2e5e626871 +Version: v3.1.0 License type (autodetected): MIT ./vendor/github.com/Azure/azure-event-hubs-go/v3/LICENSE: -------------------------------------------------------------------- @@ -428,6 +459,7 @@ License type (autodetected): MIT -------------------------------------------------------------------- Dependency: github.com/Azure/azure-pipeline-go +Version: v0.2.1 License type (autodetected): MIT ./vendor/github.com/Azure/azure-pipeline-go/LICENSE: -------------------------------------------------------------------- @@ -454,7 +486,7 @@ License type (autodetected): MIT SOFTWARE -------------------------------------------------------------------- Dependency: github.com/Azure/azure-sdk-for-go -Revision: 0820c0553d6c410603056869f7b0e52d61ce5bee +Version: v37.1.0 License type (autodetected): Apache-2.0 ./vendor/github.com/Azure/azure-sdk-for-go/LICENSE: -------------------------------------------------------------------- @@ -469,6 +501,7 @@ the Microsoft Corporation (https://www.microsoft.com). -------------------------------------------------------------------- Dependency: github.com/Azure/azure-storage-blob-go +Version: v0.8.0 License type (autodetected): MIT ./vendor/github.com/Azure/azure-storage-blob-go/LICENSE: -------------------------------------------------------------------- @@ -495,7 +528,7 @@ License type (autodetected): MIT SOFTWARE -------------------------------------------------------------------- Dependency: github.com/Azure/go-amqp -Revision: 35df54553cf7e6d1b8526b67fb5dd2e1ff0b0ff2 +Version: v0.12.6 License type (autodetected): MIT ./vendor/github.com/Azure/go-amqp/LICENSE: -------------------------------------------------------------------- @@ -523,7 +556,7 @@ License type (autodetected): MIT -------------------------------------------------------------------- Dependency: github.com/Azure/go-ansiterm -Revision: d6e3b3328b783f23731bc4d058875b0371ff8109 +Revision: d6e3b3328b78 License type (autodetected): MIT ./vendor/github.com/Azure/go-ansiterm/LICENSE: -------------------------------------------------------------------- @@ -550,17 +583,89 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/Azure/go-autorest -Revision: ba1147dc57f993013ef255c128ca1cac8a557409 +Dependency: github.com/Azure/go-autorest/autorest +Version: v0.9.4 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/adal +Version: v0.8.1 License type (autodetected): Apache-2.0 -./vendor/github.com/Azure/go-autorest/LICENSE: +./vendor/github.com/Azure/go-autorest/autorest/adal/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/azure/auth +Version: v0.4.2 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/azure/auth/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/azure/cli +Version: v0.3.1 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/azure/cli/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/date +Version: v0.2.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/date/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/to +Version: v0.3.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/to/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/autorest/validation +Version: v0.2.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/autorest/validation/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/logger +Version: v0.1.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/logger/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/Azure/go-autorest/tracing +Version: v0.5.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/Azure/go-autorest/tracing/LICENSE: -------------------------------------------------------------------- Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/beorn7/perks -Revision: 37c8de3658fcb183f997c4e13e8337516ab753e6 +Version: v1.0.1 License type (autodetected): MIT ./vendor/github.com/beorn7/perks/LICENSE: -------------------------------------------------------------------- @@ -587,7 +692,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/blakesmith/ar -Revision: 8bd4349a67f2533b078dbc524689d15dba0f4659 +Revision: 8bd4349a67f2 License type (autodetected): MIT ./vendor/github.com/blakesmith/ar/COPYING: -------------------------------------------------------------------- @@ -612,9 +717,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------- +Dependency: github.com/bradleyfalzon/ghinstallation +Version: v1.1.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/bradleyfalzon/ghinstallation/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + -------------------------------------------------------------------- Dependency: github.com/bsm/sarama-cluster -Revision: 7e67d87a6b3f83fe08c096fd084691bd9dca112f +Version: v2.1.14 +Revision: 7e67d87a6b3f License type (autodetected): MIT ./vendor/github.com/bsm/sarama-cluster/LICENSE: -------------------------------------------------------------------- @@ -642,33 +757,36 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/cavaliercoder/badio -Revision: ce5280129e9e9d80def35bfe203b845a4eebc9db +Dependency: github.com/BurntSushi/toml +Version: v0.3.1 License type (autodetected): MIT -./vendor/github.com/cavaliercoder/badio/LICENSE: +./vendor/github.com/BurntSushi/toml/COPYING: -------------------------------------------------------------------- -Copyright (c) 2015 Ryan Armstrong +The MIT License (MIT) -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Copyright (c) 2013 TOML authors -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/cavaliercoder/go-rpm -Revision: 7a9c54e3d83e935c2f070a97273c99be6a3ac2e9 +Revision: 7a9c54e3d83e License type (autodetected): BSD-3-Clause ./vendor/github.com/cavaliercoder/go-rpm/LICENSE: -------------------------------------------------------------------- @@ -700,19 +818,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/census-instrumentation/opencensus-proto -Revision: 26aa36c099c2041b432cf3cc8a26c5fb858d218b -License type (autodetected): Apache-2.0 -./vendor/github.com/census-instrumentation/opencensus-proto/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/cespare/xxhash -Revision: 2372543dd2bbab7a55ce14c54eb357abe23a42f5 +Dependency: github.com/cespare/xxhash/v2 +Version: v2.1.1 License type (autodetected): MIT -./vendor/github.com/cespare/xxhash/LICENSE.txt: +./vendor/github.com/cespare/xxhash/v2/LICENSE.txt: -------------------------------------------------------------------- Copyright (c) 2016 Caleb Spare @@ -737,41 +846,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------- -Dependency: github.com/cloudflare/cfssl -Revision: b1ec8c586c2aa3ec3eaf4a622933f169cfa5648b -License type (autodetected): BSD-2-Clause -./vendor/github.com/cloudflare/cfssl/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2014 CloudFlare Inc. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------- Dependency: github.com/cloudfoundry-community/go-cfclient -Version: master -Revision: 35bcce23fc5f8b9969723ac38c0de1f82c4d3471 +Revision: 35bcce23fc5f License type (autodetected): MIT ./vendor/github.com/cloudfoundry-community/go-cfclient/LICENSE: -------------------------------------------------------------------- @@ -799,7 +876,7 @@ THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/cloudfoundry/sonde-go -Revision: b33733203bb48d7c56de7cb639d77f78b0449d19 +Revision: b33733203bb4 License type (autodetected): Apache-2.0 ./vendor/github.com/cloudfoundry/sonde-go/LICENSE: -------------------------------------------------------------------- @@ -824,7 +901,7 @@ Limitations under the License. -------------------------------------------------------------------- Dependency: github.com/containerd/containerd -Revision: 36cf5b690dcc00ff0f34ff7799209050c3d0c59a +Version: v1.3.3 License type (autodetected): Apache-2.0 ./vendor/github.com/containerd/containerd/LICENSE: -------------------------------------------------------------------- @@ -850,7 +927,7 @@ See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -------------------------------------------------------------------- Dependency: github.com/containerd/continuity -Revision: 26c1120b8d4107d2471b93ad78ef7ce1fc84c4c4 +Revision: 26c1120b8d41 License type (autodetected): Apache-2.0 ./vendor/github.com/containerd/continuity/LICENSE: -------------------------------------------------------------------- @@ -859,7 +936,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/containerd/fifo -Revision: bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13 +Revision: bda0ff6ed73c License type (autodetected): Apache-2.0 ./vendor/github.com/containerd/fifo/LICENSE: -------------------------------------------------------------------- @@ -868,7 +945,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/coreos/bbolt -Revision: af9db2027c98c61ecd8e17caa5bd265792b9b9a2 +Version: v1.3.1 +Revision: af9db2027c98 License type (autodetected): MIT ./vendor/github.com/coreos/bbolt/LICENSE: -------------------------------------------------------------------- @@ -894,26 +972,10 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/coreos/etcd -Revision: 4d210173ae0d59d4d746735fdd26839513aadaf1 -License type (autodetected): Apache-2.0 -./vendor/github.com/coreos/etcd/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - --------NOTICE----- -CoreOS Project -Copyright 2014 CoreOS, Inc - -This product includes software developed at CoreOS, Inc. -(http://www.coreos.com/). - --------------------------------------------------------------------- -Dependency: github.com/coreos/go-systemd -Version: v20 -Revision: e64a0ec8b42a61e2a9801dc1d0abe539dea79197 +Dependency: github.com/coreos/go-systemd/v22 +Version: v22.0.0 License type (autodetected): Apache-2.0 -./vendor/github.com/coreos/go-systemd/LICENSE: +./vendor/github.com/coreos/go-systemd/v22/LICENSE: -------------------------------------------------------------------- Apache License 2.0 @@ -926,7 +988,7 @@ This product includes software developed at CoreOS, Inc. -------------------------------------------------------------------- Dependency: github.com/coreos/pkg -Revision: 97fdf19511ea361ae1c100dd393cc47f8dcfa1e1 +Revision: 97fdf19511ea License type (autodetected): Apache-2.0 ./vendor/github.com/coreos/pkg/LICENSE: -------------------------------------------------------------------- @@ -939,52 +1001,17 @@ Copyright 2014 CoreOS, Inc This product includes software developed at CoreOS, Inc. (http://www.coreos.com/). --------------------------------------------------------------------- -Dependency: github.com/DataDog/zstd -Revision: 2bf71ec4836011b92dc78df3b9ace6b40e65f7df -License type (autodetected): BSD-3-Clause -./vendor/github.com/DataDog/zstd/LICENSE: --------------------------------------------------------------------- -Simplified BSD License - -Copyright (c) 2016, Datadog -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------- Dependency: github.com/davecgh/go-spew -Version: v1.1.0 -Revision: 346938d642f2ec3594ed81d874461961cd0faa76 -License type (autodetected): MIT +Version: v1.1.1 +License type (autodetected): ISC ./vendor/github.com/davecgh/go-spew/LICENSE: -------------------------------------------------------------------- ISC License Copyright (c) 2012-2016 Dave Collins -Permission to use, copy, modify, and distribute this software for any +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -998,7 +1025,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/davecgh/go-xdr -Revision: e6a2ba005892b6a5b27cb5352f64c2e96942dd28 +Revision: e6a2ba005892 License type (autodetected): MIT ./vendor/github.com/davecgh/go-xdr/LICENSE: -------------------------------------------------------------------- @@ -1017,7 +1044,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/denisenkom/go-mssqldb -Revision: 4e0d7dc8888fbb59764060e99b7b68e77a6f9698 +Revision: 4e0d7dc8888f License type (autodetected): BSD-3-Clause ./vendor/github.com/denisenkom/go-mssqldb/LICENSE.txt: -------------------------------------------------------------------- @@ -1051,7 +1078,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/devigned/tab -Revision: 0c15cf42f9a213a393bbc9ddbd13c231c7a36af0 +Version: v0.1.2 +Revision: 0c15cf42f9a2 License type (autodetected): MIT ./vendor/github.com/devigned/tab/LICENSE: -------------------------------------------------------------------- @@ -1079,7 +1107,8 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/dgrijalva/jwt-go -Revision: 5e25c22bd5d6de03265bbe5462dcd162f85046f6 +Version: v3.2.1 +Revision: 5e25c22bd5d6 License type (autodetected): MIT ./vendor/github.com/dgrijalva/jwt-go/LICENSE: -------------------------------------------------------------------- @@ -1094,7 +1123,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------- Dependency: github.com/digitalocean/go-libvirt -Revision: 6075ea3c39a182efd22179110e92d4e8a8892d00 +Revision: 6075ea3c39a1 License type (autodetected): Apache-2.0 ./vendor/github.com/digitalocean/go-libvirt/LICENSE.md: -------------------------------------------------------------------- @@ -1103,7 +1132,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/dimchansky/utfbom -Revision: d2133a1ce379ef6fa992b0514a77146c60db9d1c +Version: v1.1.0 License type (autodetected): Apache-2.0 ./vendor/github.com/dimchansky/utfbom/LICENSE: -------------------------------------------------------------------- @@ -1112,7 +1141,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/dlclark/regexp2 -Revision: 7632a260cbaf5e7594fc1544a503456ecd0827f1 +Version: v1.1.7 +Revision: 7632a260cbaf License type (autodetected): MIT ./vendor/github.com/dlclark/regexp2/LICENSE: -------------------------------------------------------------------- @@ -1140,7 +1170,7 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/docker/distribution -Revision: aeaeb844071362767ad497eb0911fcf60e47fa11 +Version: v2.7.1 License type (autodetected): Apache-2.0 ./vendor/github.com/docker/distribution/LICENSE: -------------------------------------------------------------------- @@ -1149,8 +1179,10 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/docker/docker -Version: v19.03.5 -Revision: ea84732a77251e0d7af278e2b7df1d6a59fca46b +Version: v1.4.2 +Revision: 8af4db6f002a +Overwrite: github.com/docker/engine +Overwrite-Revision: ea84732a7725 License type (autodetected): Apache-2.0 ./vendor/github.com/docker/docker/LICENSE: -------------------------------------------------------------------- @@ -1179,26 +1211,16 @@ See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -------------------------------------------------------------------- Dependency: github.com/docker/go-connections -Version: v0.3.0 -Revision: 3ede32e2033de7505e6500d6c868c2b9ed9f169d +Version: v0.4.0 License type (autodetected): Apache-2.0 ./vendor/github.com/docker/go-connections/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: github.com/docker/go-events -Revision: e31b211e4f1cd09aa76fe4ac244571fab96ae47f -License type (autodetected): Apache-2.0 -./vendor/github.com/docker/go-events/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/docker/go-metrics -Revision: b619b3592b65de4f087d9f16863a7e6ff905973c +Version: v0.0.1 License type (autodetected): Apache-2.0 ./vendor/github.com/docker/go-metrics/LICENSE: -------------------------------------------------------------------- @@ -1224,7 +1246,9 @@ See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -------------------------------------------------------------------- Dependency: github.com/docker/go-plugins-helpers -Revision: 1e6269c305b8c75cfda1c8aa91349c38d7335814 +Revision: 1e6269c305b8 +Overwrite: github.com/elastic/go-plugins-helpers +Overwrite-Revision: bdf17607b79f License type (autodetected): Apache-2.0 ./vendor/github.com/docker/go-plugins-helpers/LICENSE: -------------------------------------------------------------------- @@ -1253,52 +1277,17 @@ See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -------------------------------------------------------------------- Dependency: github.com/docker/go-units -Revision: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 +Version: v0.4.0 License type (autodetected): Apache-2.0 ./vendor/github.com/docker/go-units/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: github.com/docker/libkv -Revision: 458977154600b9f23984d9f4b82e79570b5ae12b -License type (autodetected): Apache-2.0 -./vendor/github.com/docker/libkv/LICENSE.code: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/docker/libnetwork -Revision: 92d1fbe1eb0883cf11d283cea8e658275146411d -License type (autodetected): Apache-2.0 -./vendor/github.com/docker/libnetwork/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/docker/libtrust -Revision: aabc10ec26b754e797f9028f4589c5b7bd90dc20 -License type (autodetected): Apache-2.0 -./vendor/github.com/docker/libtrust/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/docker/swarmkit -Revision: 958d149179db019aef3a065f23b35455b2dd54ca -License type (autodetected): Apache-2.0 -./vendor/github.com/docker/swarmkit/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/dop251/goja -Revision: dd2ac4456e2073f116d6b88741d513addabe0326 +Overwrite: github.com/andrewkroh/goja +Overwrite-Revision: dd2ac4456e20 License type (autodetected): MIT ./vendor/github.com/dop251/goja/LICENSE: -------------------------------------------------------------------- @@ -1320,7 +1309,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -------------------------------------------------------------------- Dependency: github.com/dop251/goja_nodejs -Revision: adff31b136e6b7e044712aab7236a775e1bd085e +Revision: adff31b136e6 License type (autodetected): MIT ./vendor/github.com/dop251/goja_nodejs/LICENSE: -------------------------------------------------------------------- @@ -1340,7 +1329,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -------------------------------------------------------------------- Dependency: github.com/dustin/go-humanize -Revision: 259d2a102b871d17f30e3cd9881a642961a1e486 +Revision: bb3d318650d4 License type (autodetected): MIT ./vendor/github.com/dustin/go-humanize/LICENSE: -------------------------------------------------------------------- @@ -1368,7 +1357,7 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/eapache/go-resiliency -Revision: b86b1ec0dd4209a588dc1285cdd471e73525c0b3 +Version: v1.1.0 License type (autodetected): MIT ./vendor/github.com/eapache/go-resiliency/LICENSE: -------------------------------------------------------------------- @@ -1397,7 +1386,7 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/eapache/go-xerial-snappy -Revision: bb955e01b9346ac19dc29eb16586c90ded99a98c +Revision: 776d5712da21 License type (autodetected): MIT ./vendor/github.com/eapache/go-xerial-snappy/LICENSE: -------------------------------------------------------------------- @@ -1425,7 +1414,7 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/eapache/queue -Revision: 44cc805cf13205b55f69e14bcb69867d1ae92f98 +Version: v1.1.0 License type (autodetected): MIT ./vendor/github.com/eapache/queue/LICENSE: -------------------------------------------------------------------- @@ -1452,7 +1441,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/eclipse/paho.mqtt.golang -Revision: 0d940dd29fd24f905cd16b28b1209b4977b97e1a +Version: v1.2.1 +Revision: 0d940dd29fd2 License type (autodetected): EPL-1.0 ./vendor/github.com/eclipse/paho.mqtt.golang/LICENSE: -------------------------------------------------------------------- @@ -1546,27 +1536,45 @@ This Agreement is governed by the laws of the State of New York and the intellec -------------------------------------------------------------------- Dependency: github.com/elastic/ecs Version: v1.4.0 -Revision: cc4b36eebec29975f57cd0475c3987c9bde5c15a License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/ecs/LICENSE.txt: -------------------------------------------------------------------- Apache License 2.0 +-------NOTICE.txt----- +Elastic Common Schema +Copyright 2018 Elasticsearch B.V. --------------------------------------------------------------------- -Dependency: github.com/elastic/go-libaudit -Version: v0.4.0 -Revision: 39073a2988f718067d85d27a4d18b1b57de5d947 -License type (autodetected): Apache-2.0 -./vendor/github.com/elastic/go-libaudit/LICENSE.txt: --------------------------------------------------------------------- -Apache License 2.0 +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +-------------------------------------------------------------------- +Dependency: github.com/elastic/go-libaudit +Version: v0.4.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/elastic/go-libaudit/LICENSE.txt: +-------------------------------------------------------------------- +Apache License 2.0 + +-------NOTICE.txt----- +Elastic go-libaudit +Copyright 2017-2018 Elasticsearch B.V. + +This product includes software developed at +Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/go-licenser -Version: 0.2.0 -Revision: 2b2abd4ee9b58025ebd0630d7621cfd7619f58ac +Version: v0.2.1 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-licenser/LICENSE: -------------------------------------------------------------------- @@ -1581,8 +1589,7 @@ Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/go-lookslike -Version: =v0.3.0 -Revision: 747dc7db1c961662d8e225a42af6c3859a1a0f1d +Version: v0.3.0 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-lookslike/LICENSE: -------------------------------------------------------------------- @@ -1591,7 +1598,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-lumber -Revision: 616041e345fc33c97bc0eb0fa6b388aa07bca3e1 +Version: v0.1.0 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-lumber/LICENSE: -------------------------------------------------------------------- @@ -1600,7 +1607,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-perf -Revision: 9c656876f595360525261b7db5bbbcd3c40b7dbb +Revision: 9c656876f595 License type (autodetected): BSD-3-Clause ./vendor/github.com/elastic/go-perf/LICENSE: -------------------------------------------------------------------- @@ -1635,17 +1642,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/elastic/go-seccomp-bpf Version: v1.1.0 -Revision: 4e6640ac0ec1b7cd22a7ec12f4ca610efbe3c4d9 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-seccomp-bpf/LICENSE.txt: -------------------------------------------------------------------- Apache License 2.0 +-------NOTICE.txt----- +Elastic go-seccomp-bpf +Copyright 2018 Elasticsearch B.V. + +This product includes software developed at +Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/go-structform Version: v0.0.6 -Revision: a50e916a1b628ad1abc6f58b47668a2f60075ef1 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-structform/LICENSE: -------------------------------------------------------------------- @@ -1655,7 +1666,6 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-sysinfo Version: v1.3.0 -Revision: b719bc42e40963c707571af208683a049e61f07f License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-sysinfo/LICENSE.txt: -------------------------------------------------------------------- @@ -1671,7 +1681,6 @@ Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/go-txfile Version: v0.0.7 -Revision: 4acb7500cf41aea9d6362378aee5ebacac831ea4 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-txfile/LICENSE: -------------------------------------------------------------------- @@ -1681,7 +1690,6 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-ucfg Version: v0.8.3 -Revision: f3ae3b220df32cfcae011ec6bbf87a711e6bf06b License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-ucfg/LICENSE: -------------------------------------------------------------------- @@ -1691,17 +1699,21 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-windows Version: v1.0.1 -Revision: 8c929792e70203792e3baf128c380e28754ae8b5 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-windows/LICENSE.txt: -------------------------------------------------------------------- Apache License 2.0 +-------NOTICE.txt----- +Elastic go-windows +Copyright 2017-2019 Elasticsearch B.V. + +This product includes software developed at +Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/gosigar Version: v0.10.5 -Revision: 7aef3366157f2bfdf3e068f73ce7193573e88e0c License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/gosigar/LICENSE: -------------------------------------------------------------------- @@ -1720,7 +1732,6 @@ subcomponent's license, as noted in the LICENSE file. -------------------------------------------------------------------- Dependency: github.com/fatih/color Version: v1.5.0 -Revision: 570b54cabe6b8eb0bc2dfce68d964677d63b5260 License type (autodetected): MIT ./vendor/github.com/fatih/color/LICENSE.md: -------------------------------------------------------------------- @@ -1747,7 +1758,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/fsnotify/fsevents -Revision: e1d381a4d27063baac2e9d3c5887ceb4ab059287 +Overwrite: github.com/elastic/fsevents +Overwrite-Revision: e1d381a4d270 License type (autodetected): BSD-3-Clause ./vendor/github.com/fsnotify/fsevents/LICENSE: -------------------------------------------------------------------- @@ -1781,7 +1793,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/fsnotify/fsnotify -Revision: c9bbe1f46f1da9904baf3916a4ba4aec7f1e9000 +Version: v1.4.7 +Overwrite: github.com/adriansr/fsnotify +Overwrite-Revision: c9bbe1f46f1d License type (autodetected): BSD-3-Clause ./vendor/github.com/fsnotify/fsnotify/LICENSE: -------------------------------------------------------------------- @@ -1816,81 +1830,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/garyburd/redigo -Revision: b8dc90050f24c1a73a52f107f3f575be67b21b7c +Version: v1.0.1 +Revision: b8dc90050f24 License type (autodetected): Apache-2.0 ./vendor/github.com/garyburd/redigo/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: github.com/ghodss/yaml -Revision: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 -License type (autodetected): MIT -./vendor/github.com/ghodss/yaml/LICENSE: --------------------------------------------------------------------- -The MIT License (MIT) - -Copyright (c) 2014 Sam Ghods - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - -Copyright (c) 2012 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- -Dependency: github.com/go-ini/ini -License type (autodetected): Apache-2.0 -./vendor/github.com/go-ini/ini/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/go-ole/go-ole -Revision: 14974a1cf6477f616180232977d8ab4791ea8820 +Version: v1.2.5 +Revision: 14974a1cf647 License type (autodetected): MIT ./vendor/github.com/go-ole/go-ole/LICENSE: -------------------------------------------------------------------- @@ -1918,7 +1869,7 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/go-sourcemap/sourcemap -Revision: b019cc30c1eaa584753491b0d8f8c1534bf1eb44 +Version: v2.1.2 License type (autodetected): BSD-2-Clause ./vendor/github.com/go-sourcemap/sourcemap/LICENSE: -------------------------------------------------------------------- @@ -1951,7 +1902,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/go-sql-driver/mysql Version: v1.4.1 -Revision: 72cd26f257d44c1114970e19afddcd812016007e License type (autodetected): MPL-2.0 ./vendor/github.com/go-sql-driver/mysql/LICENSE: -------------------------------------------------------------------- @@ -2331,7 +2281,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------- Dependency: github.com/gocarina/gocsv -Revision: ffef3ffc77bec026fefa6f76bd53d158cfa0e669 +Revision: ffef3ffc77be License type (autodetected): MIT ./vendor/github.com/gocarina/gocsv/LICENSE: -------------------------------------------------------------------- @@ -2357,10 +2307,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/godbus/dbus -Revision: 37bf87eef99d69c4f1d3528bd66e3a87dc201472 +Dependency: github.com/godbus/dbus/v5 +Version: v5.0.3 License type (autodetected): BSD-2-Clause -./vendor/github.com/godbus/dbus/LICENSE: +./vendor/github.com/godbus/dbus/v5/LICENSE: -------------------------------------------------------------------- Copyright (c) 2013, Georg Reinke (), Google All rights reserved. @@ -2391,7 +2341,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/godror/godror Version: v0.10.4 -Revision: 0123d49bd73e1bed106ac8b6af67f943fbbf06e2 License type (autodetected): Apache-2.0 ./vendor/github.com/godror/godror/LICENSE.md: -------------------------------------------------------------------- @@ -2623,7 +2572,8 @@ END OF TERMS AND CONDITIONS -------------------------------------------------------------------- Dependency: github.com/gofrs/flock -Revision: 5135e617513b1e6e205a3a89b042249dee6730c8 +Version: v0.7.2 +Revision: 5135e617513b License type (autodetected): BSD-3-Clause ./vendor/github.com/gofrs/flock/LICENSE: -------------------------------------------------------------------- @@ -2657,8 +2607,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/gofrs/uuid -Version: 3.1.1 -Revision: 47cd1dca1a6e7f807d5a492bd7e7f41d0855b5a1 +Version: v3.2.0 License type (autodetected): MIT ./vendor/github.com/gofrs/uuid/LICENSE: -------------------------------------------------------------------- @@ -2685,7 +2634,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/gogo/protobuf -Revision: 4c00d2f19fb91be5fecd8681fa83450a2a979e69 +Version: v1.3.1 License type (autodetected): BSD-3-Clause ./vendor/github.com/gogo/protobuf/LICENSE: -------------------------------------------------------------------- @@ -2726,17 +2675,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/golang/glog -Revision: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 +Dependency: github.com/golang/groupcache +Revision: 215e87163ea7 License type (autodetected): Apache-2.0 -./vendor/github.com/golang/glog/LICENSE: +./vendor/github.com/golang/groupcache/LICENSE: -------------------------------------------------------------------- Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/golang/protobuf -Revision: 6c65a5562fc06764971b7c5d05c76c75e84bdbf7 +Version: v1.3.2 License type (autodetected): BSD-3-Clause ./vendor/github.com/golang/protobuf/LICENSE: -------------------------------------------------------------------- @@ -2771,7 +2720,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/golang/snappy -Revision: 553a641470496b2327abcac10b36396bd98e45c9 +Version: v0.0.1 License type (autodetected): BSD-3-Clause ./vendor/github.com/golang/snappy/LICENSE: -------------------------------------------------------------------- @@ -2803,18 +2752,10 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -Dependency: github.com/google/certificate-transparency-go -Revision: 2c006aff63ed2c60653701dfb7b53424339382b1 -License type (autodetected): Apache-2.0 -./vendor/github.com/google/certificate-transparency-go/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/google/flatbuffers -Revision: 7a6b2bf521e95097a92ec848001531b2dcf0f3fa +Version: v1.7.2 +Revision: 7a6b2bf521e9 License type (autodetected): Apache-2.0 ./vendor/github.com/google/flatbuffers/LICENSE.txt: -------------------------------------------------------------------- @@ -2823,7 +2764,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/google/go-cmp -Revision: 1b316004397f1f336546ca058ddb5b95c41a8772 +Version: v0.4.0 License type (autodetected): BSD-3-Clause ./vendor/github.com/google/go-cmp/LICENSE: -------------------------------------------------------------------- @@ -2855,9 +2796,111 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------- +Dependency: github.com/google/go-github/v28 +Version: v28.1.1 +License type (autodetected): BSD-3-Clause +./vendor/github.com/google/go-github/v28/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2013 The go-github AUTHORS. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- +Dependency: github.com/google/go-github/v29 +Version: v29.0.2 +License type (autodetected): BSD-3-Clause +./vendor/github.com/google/go-github/v29/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2013 The go-github AUTHORS. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- +Dependency: github.com/google/go-querystring +Version: v1.0.0 +License type (autodetected): BSD-3-Clause +./vendor/github.com/google/go-querystring/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2013 Google. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + -------------------------------------------------------------------- Dependency: github.com/google/gofuzz -Revision: f140a6486e521aad38f5917de355cbf147cc0496 +Version: v1.0.0 License type (autodetected): Apache-2.0 ./vendor/github.com/google/gofuzz/LICENSE: -------------------------------------------------------------------- @@ -2866,7 +2909,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/google/gopacket -Revision: 0ad7f2610e344e58c1c95e2adda5c3258da8e97b +Version: v1.1.18 +Revision: 0ad7f2610e34 License type (autodetected): BSD-3-Clause ./vendor/github.com/google/gopacket/LICENSE: -------------------------------------------------------------------- @@ -2901,7 +2945,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/google/uuid -Revision: c2e93f3ae59f2904160ceaab466009f965df46d6 +Version: v1.1.2 +Revision: c2e93f3ae59f License type (autodetected): BSD-3-Clause ./vendor/github.com/google/uuid/LICENSE: -------------------------------------------------------------------- @@ -2934,11 +2979,10 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/googleapis/gax-go +Dependency: github.com/googleapis/gax-go/v2 Version: v2.0.5 -Revision: bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 License type (autodetected): BSD-3-Clause -./vendor/github.com/googleapis/gax-go/LICENSE: +./vendor/github.com/googleapis/gax-go/v2/LICENSE: -------------------------------------------------------------------- Copyright 2016, Google Inc. All rights reserved. @@ -2970,7 +3014,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/googleapis/gnostic -Revision: 25d8b0b6698593f520d9d8dc5a88e6b16ca9ecc0 +Version: v0.3.1 +Revision: 25d8b0b66985 License type (autodetected): Apache-2.0 ./vendor/github.com/googleapis/gnostic/LICENSE: -------------------------------------------------------------------- @@ -2979,7 +3024,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/gorhill/cronexpr -Revision: d520615e531a6bf3fb69406b9eba718261285ec8 +Revision: d520615e531a License type (autodetected): Apache-2.0 ./vendor/github.com/gorhill/cronexpr/APLv2: -------------------------------------------------------------------- @@ -2988,7 +3033,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/gorilla/websocket -Revision: c3e18be99d19e6b3e8f1559eea2c161a665c4b6b +Version: v1.4.1 License type (autodetected): BSD-2-Clause ./vendor/github.com/gorilla/websocket/LICENSE: -------------------------------------------------------------------- @@ -3016,53 +3061,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/grpc-ecosystem/go-grpc-prometheus -Revision: ae0d8660c5f2108ca70a3776dbe0fb53cf79f1da -License type (autodetected): Apache-2.0 -./vendor/github.com/grpc-ecosystem/go-grpc-prometheus/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/grpc-ecosystem/grpc-gateway -Revision: d63917fcb0d53f39184485b9b6a0893af18a5668 -License type (autodetected): BSD-3-Clause -./vendor/github.com/grpc-ecosystem/grpc-gateway/LICENSE.txt: --------------------------------------------------------------------- -Copyright (c) 2015, Gengo, Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name of Gengo, Inc. nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- -Dependency: github.com/hashicorp/go-immutable-radix -Revision: 0146a9aba1948ded4ed290cfd3fded2c15313f63 +Dependency: github.com/hashicorp/go-uuid +Version: v1.0.1 License type (autodetected): MPL-2.0 -./vendor/github.com/hashicorp/go-immutable-radix/LICENSE: +./vendor/github.com/hashicorp/go-uuid/LICENSE: -------------------------------------------------------------------- Mozilla Public License, version 2.0 @@ -3429,98 +3431,98 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------- -Dependency: github.com/hashicorp/go-memdb -Revision: 5500ca0de0dab231b02aedabac095d43a59f31d2 +Dependency: github.com/hashicorp/go-version +Version: v1.0.0 License type (autodetected): MPL-2.0 -./vendor/github.com/hashicorp/go-memdb/LICENSE: +./vendor/github.com/hashicorp/go-version/LICENSE: -------------------------------------------------------------------- Mozilla Public License, version 2.0 1. Definitions -1.1. "Contributor" +1.1. “Contributor” means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. -1.2. "Contributor Version" +1.2. “Contributor Version” means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. + Contributor and that particular Contributor’s Contribution. -1.3. "Contribution" +1.3. “Contribution” means Covered Software of a particular Contributor. -1.4. "Covered Software" +1.4. “Covered Software” means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. -1.5. "Incompatible With Secondary Licenses" +1.5. “Incompatible With Secondary Licenses” means a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. + b. that the Covered Software was made available under the terms of version + 1.1 or earlier of the License, but not also under the terms of a + Secondary License. -1.6. "Executable Form" +1.6. “Executable Form” means any form of the work other than Source Code Form. -1.7. "Larger Work" +1.7. “Larger Work” - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. + means a work that combines Covered Software with other material, in a separate + file or files, that is not Covered Software. -1.8. "License" +1.8. “License” means this document. -1.9. "Licensable" +1.9. “Licensable” - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. + means having the right to grant, to the maximum extent possible, whether at the + time of the initial grant or subsequently, any and all of the rights conveyed by + this License. -1.10. "Modifications" +1.10. “Modifications” means any of the following: - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or + a. any file in Source Code Form that results from an addition to, deletion + from, or modification of the contents of Covered Software; or b. any new file in Source Code Form that contains any Covered Software. -1.11. "Patent Claims" of a Contributor +1.11. “Patent Claims” of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. + means any patent claim(s), including without limitation, method, process, + and apparatus claims, in any patent Licensable by such Contributor that + would be infringed, but for the grant of the License, by the making, + using, selling, offering for sale, having made, import, or transfer of + either its Contributions or its Contributor Version. -1.12. "Secondary License" +1.12. “Secondary License” means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. -1.13. "Source Code Form" +1.13. “Source Code Form” means the form of the work preferred for making modifications. -1.14. "You" (or "Your") +1.14. “You” (or “Your”) means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is + License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause + definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. @@ -3536,59 +3538,57 @@ Mozilla Public License, version 2.0 a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and + Contributions, either on an unmodified basis, with Modifications, or as + part of a Larger Work; and b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. + sale, have made, import, and otherwise transfer either its Contributions + or its Contributor Version. 2.2. Effective Date - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. + The licenses granted in Section 2.1 with respect to any Contribution become + effective for each Contribution on the date the Contributor first distributes + such Contribution. 2.3. Limitations on Grant Scope - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: + The licenses granted in this Section 2 are the only rights granted under this + License. No additional rights or licenses will be implied from the distribution + or licensing of Covered Software under this License. Notwithstanding Section + 2.1(b) above, no patent license is granted by a Contributor: a. for any code that a Contributor has removed from Covered Software; or - b. for infringements caused by: (i) Your and any other third party's + b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. + c. under Patent Claims infringed by Covered Software in the absence of its + Contributions. - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). + This License does not grant any rights in the trademarks, service marks, or + logos of any Contributor (except as may be necessary to comply with the + notice requirements in Section 3.4). 2.4. Subsequent Licenses No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). + distribute the Covered Software under a subsequent version of this License + (see Section 10.2) or under the terms of a Secondary License (if permitted + under the terms of Section 3.3). 2.5. Representation - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. + Each Contributor represents that the Contributor believes its Contributions + are its original creation(s) or it has sufficient rights to grant the + rights to its Contributions conveyed by this License. 2.6. Fair Use - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. + This License is not intended to limit any rights You have under applicable + copyright doctrines of fair use, fair dealing, or other equivalents. 2.7. Conditions @@ -3601,12 +3601,11 @@ Mozilla Public License, version 2.0 3.1. Distribution of Source Form All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. + Modifications that You create or to which You contribute, must be under the + terms of this License. You must inform recipients that the Source Code Form + of the Covered Software is governed by the terms of this License, and how + they can obtain a copy of this License. You may not attempt to alter or + restrict the recipients’ rights in the Source Code Form. 3.2. Distribution of Executable Form @@ -3618,40 +3617,39 @@ Mozilla Public License, version 2.0 reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. + b. You may distribute such Executable Form under the terms of this License, + or sublicense it under different terms, provided that the license for + the Executable Form does not attempt to limit or alter the recipients’ + rights in the Source Code Form under this License. 3.3. Distribution of a Larger Work You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). + provided that You also comply with the requirements of this License for the + Covered Software. If the Larger Work is a combination of Covered Software + with a work governed by one or more Secondary Licenses, and the Covered + Software is not Incompatible With Secondary Licenses, this License permits + You to additionally distribute such Covered Software under the terms of + such Secondary License(s), so that the recipient of the Larger Work may, at + their option, further distribute the Covered Software under the terms of + either this License or such Secondary License(s). 3.4. Notices - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. + You may not remove or alter the substance of any license notices (including + copyright notices, patent notices, disclaimers of warranty, or limitations + of liability) contained within the Source Code Form of the Covered + Software, except that You may alter any license notices to the extent + required to remedy known factual inaccuracies. 3.5. Application of Additional Terms You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any + Software. However, You may do so only on Your own behalf, and not on behalf + of any Contributor. You must make it absolutely clear that any such + warranty, support, indemnity, or liability obligation is offered by You + alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any @@ -3660,14 +3658,14 @@ Mozilla Public License, version 2.0 4. Inability to Comply Due to Statute or Regulation If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. + with respect to some or all of the Covered Software due to statute, judicial + order, or regulation then You must: (a) comply with the terms of this License + to the maximum extent possible; and (b) describe the limitations and the code + they affect. Such description must be placed in a text file included with all + distributions of the Covered Software under this License. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. 5. Termination @@ -3675,22 +3673,21 @@ Mozilla Public License, version 2.0 fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. + explicitly and finally terminates Your grants, and (b) on an ongoing basis, + if such Contributor fails to notify You of the non-compliance by some + reasonable means prior to 60 days after You have come back into compliance. + Moreover, Your grants from a particular Contributor are reinstated on an + ongoing basis if such Contributor notifies You of the non-compliance by + some reasonable means, this is the first time You have received notice of + non-compliance with this License from such Contributor, and You become + compliant prior to 30 days after Your receipt of the notice. 5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. + infringement claim (excluding declaratory judgment actions, counter-claims, + and cross-claims) alleging that a Contributor Version directly or + indirectly infringes any patent, then the rights granted to You by any and + all Contributors for the Covered Software under Section 2.1 of this License + shall terminate. 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been @@ -3699,16 +3696,16 @@ Mozilla Public License, version 2.0 6. Disclaimer of Warranty - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. + Covered Software is provided under this License on an “as is” basis, without + warranty of any kind, either expressed, implied, or statutory, including, + without limitation, warranties that the Covered Software is free of defects, + merchantable, fit for a particular purpose or non-infringing. The entire + risk as to the quality and performance of the Covered Software is with You. + Should any Covered Software prove defective in any respect, You (not any + Contributor) assume the cost of any necessary servicing, repair, or + correction. This disclaimer of warranty constitutes an essential part of this + License. No use of any Covered Software is authorized under this License + except under this disclaimer. 7. Limitation of Liability @@ -3720,29 +3717,27 @@ Mozilla Public License, version 2.0 goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. + shall not apply to liability for death or personal injury resulting from such + party’s negligence to the extent applicable law prohibits such limitation. + Some jurisdictions do not allow the exclusion or limitation of incidental or + consequential damages, so this exclusion and limitation may not apply to You. 8. Litigation - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. + Any litigation relating to this License may be brought only in the courts of + a jurisdiction where the defendant maintains its principal place of business + and such litigation shall be governed by laws of that jurisdiction, without + reference to its conflict-of-law provisions. Nothing in this Section shall + prevent a party’s ability to bring cross-claims or counter-claims. 9. Miscellaneous - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. + This License represents the complete agreement concerning the subject matter + hereof. If any provision of this License is held to be unenforceable, such + provision shall be reformed only to the extent necessary to make it + enforceable. Any law or regulation which provides that the language of a + contract shall be construed against the drafter shall not be used to construe + this License against a Contributor. 10. Versions of the License @@ -3756,24 +3751,23 @@ Mozilla Public License, version 2.0 10.2. Effect of New Versions - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license + You may distribute the Covered Software under the terms of the version of + the License under which You originally received the Covered Software, or + under the terms of any subsequent version published by the license steward. 10.3. Modified Versions If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). + create a new license for such software, you may create and use a modified + version of this License if you rename the license and remove any + references to the name of the license steward (except to note that such + modified license differs from this License). -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. +10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. Exhibit A - Source Code Form License Notice @@ -3784,25 +3778,25 @@ Exhibit A - Source Code Form License Notice obtain one at http://mozilla.org/MPL/2.0/. -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. +If it is not possible or desirable to put the notice in a particular file, then +You may include the notice in a location (such as a LICENSE file in a relevant +directory) where a recipient would be likely to look for such a notice. You may add additional accurate notices of copyright ownership. -Exhibit B - "Incompatible With Secondary Licenses" Notice +Exhibit B - “Incompatible With Secondary Licenses” Notice - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by + This Source Code Form is “Incompatible + With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0. -------------------------------------------------------------------- -Dependency: github.com/hashicorp/go-uuid -Revision: 4f571afc59f3043a65f8fe6bf46d887b10a01d43 +Dependency: github.com/hashicorp/golang-lru +Version: v0.5.2 +Revision: 59383c442f7d License type (autodetected): MPL-2.0 -./vendor/github.com/hashicorp/go-uuid/LICENSE: +./vendor/github.com/hashicorp/golang-lru/LICENSE: -------------------------------------------------------------------- Mozilla Public License, version 2.0 @@ -4167,384 +4161,355 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. - -------------------------------------------------------------------- -Dependency: github.com/hashicorp/golang-lru -Revision: 59383c442f7d7b190497e9bb8fc17a48d06cd03f -License type (autodetected): MPL-2.0 -./vendor/github.com/hashicorp/golang-lru/LICENSE: +Dependency: github.com/haya14busa/go-actions-toolkit +Revision: ca0307860f01 +License type (autodetected): MIT +./vendor/github.com/haya14busa/go-actions-toolkit/LICENSE: -------------------------------------------------------------------- -Mozilla Public License, version 2.0 - -1. Definitions +MIT License -1.1. "Contributor" +Copyright (c) 2020 haya14busa - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -1.2. "Contributor Version" +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -1.3. "Contribution" +--- - means Covered Software of a particular Contributor. +https://github.com/actions/toolkit -1.4. "Covered Software" +Copyright 2019 GitHub - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -1.5. "Incompatible With Secondary Licenses" - means +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. +-------------------------------------------------------------------- +Dependency: github.com/imdario/mergo +Version: v0.3.6 +License type (autodetected): BSD-3-Clause +./vendor/github.com/imdario/mergo/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2013 Dario Castañé. All rights reserved. +Copyright (c) 2012 The Go Authors. All rights reserved. -1.6. "Executable Form" +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - means any form of the work other than Source Code Form. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. -1.7. "Larger Work" +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. +-------------------------------------------------------------------- +Dependency: github.com/inconshreveable/mousetrap +Version: v1.0.0 +License type (autodetected): Apache-2.0 +./vendor/github.com/inconshreveable/mousetrap/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 -1.8. "License" - means this document. +-------------------------------------------------------------------- +Dependency: github.com/insomniacslk/dhcp +Revision: 633285ba52b2 +Overwrite: github.com/elastic/dhcp +Overwrite-Revision: 57ec251c7eb3 +License type (autodetected): BSD-3-Clause +./vendor/github.com/insomniacslk/dhcp/LICENSE: +-------------------------------------------------------------------- +BSD 3-Clause License -1.9. "Licensable" +Copyright (c) 2018, Andrea Barberio +All rights reserved. - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1.10. "Modifications" +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. - means any of the following: +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. - b. any new file in Source Code Form that contains any Covered Software. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. +-------------------------------------------------------------------- +Dependency: github.com/jcmturner/gofork +Version: v1.0.0 +License type (autodetected): BSD-3-Clause +./vendor/github.com/jcmturner/gofork/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2009 The Go Authors. All rights reserved. -1.12. "Secondary License" +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. -1.13. "Source Code Form" +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - means the form of the work preferred for making modifications. +-------------------------------------------------------------------- +Dependency: github.com/jmespath/go-jmespath +Revision: c2b33e8439af +License type (autodetected): Apache-2.0 +./vendor/github.com/jmespath/go-jmespath/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. +-------------------------------------------------------------------- +Dependency: github.com/jmoiron/sqlx +Version: v1.2.1 +Revision: d7d95172beb5 +License type (autodetected): MIT +./vendor/github.com/jmoiron/sqlx/LICENSE: +-------------------------------------------------------------------- + Copyright (c) 2013, Jason Moiron + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: -2. License Grants and Conditions + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. -2.1. Grants + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and +-------------------------------------------------------------------- +Dependency: github.com/joeshaw/multierror +Revision: 69b34d4ec901 +License type (autodetected): MIT +./vendor/github.com/joeshaw/multierror/LICENSE: +-------------------------------------------------------------------- +The MIT License (MIT) - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. +Copyright (c) 2014 Joe Shaw -2.2. Effective Date +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -2.3. Limitations on Grant Scope +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: +-------------------------------------------------------------------- +Dependency: github.com/jpillora/backoff +Version: v1.0.0 +License type (autodetected): MIT +./vendor/github.com/jpillora/backoff/LICENSE: +-------------------------------------------------------------------- +The MIT License (MIT) - a. for any code that a Contributor has removed from Covered Software; or +Copyright (c) 2017 Jaime Pillora - b. for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -2.4. Subsequent Licenses +-------------------------------------------------------------------- +Dependency: github.com/json-iterator/go +Version: v1.1.7 +License type (autodetected): MIT +./vendor/github.com/json-iterator/go/LICENSE: +-------------------------------------------------------------------- +MIT License - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). +Copyright (c) 2016 json-iterator -2.5. Representation +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -2.6. Fair Use +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. +-------------------------------------------------------------------- +Dependency: github.com/jstemmer/go-junit-report +Version: v0.9.1 +License type (autodetected): MIT +./vendor/github.com/jstemmer/go-junit-report/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2012 Joel Stemmer -2.7. Conditions +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -3. Responsibilities +-------------------------------------------------------------------- +Dependency: github.com/klauspost/compress +Version: v1.9.3 +Revision: c099ac9f21dd +License type (autodetected): BSD-3-Clause +./vendor/github.com/klauspost/compress/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2012 The Go Authors. All rights reserved. +Copyright (c) 2019 Klaus Post. All rights reserved. -3.1. Distribution of Source Form +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice - - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by - the Mozilla Public License, v. 2.0. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/imdario/mergo -Revision: 9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4 +Dependency: github.com/klauspost/compress/snappy License type (autodetected): BSD-3-Clause -./vendor/github.com/imdario/mergo/LICENSE: +./vendor/github.com/klauspost/compress/snappy/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2013 Dario Castañé. All rights reserved. -Copyright (c) 2012 The Go Authors. All rights reserved. +Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -4573,142 +4538,96 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/inconshreveable/mousetrap -Revision: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -License type (autodetected): Apache-2.0 -./vendor/github.com/inconshreveable/mousetrap/LICENSE: +Dependency: github.com/klauspost/compress/zstd/internal/xxhash +License type (autodetected): MIT +./vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt: -------------------------------------------------------------------- -Apache License 2.0 +Copyright (c) 2016 Caleb Spare +MIT License --------------------------------------------------------------------- -Dependency: github.com/insomniacslk/dhcp -Revision: 633285ba52b2a67b98a3026eb87ee1a76ab60f3c -License type (autodetected): BSD-3-Clause -./vendor/github.com/insomniacslk/dhcp/LICENSE: --------------------------------------------------------------------- -BSD 3-Clause License +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -Copyright (c) 2018, Andrea Barberio -All rights reserved. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +-------------------------------------------------------------------- +Dependency: github.com/konsorten/go-windows-terminal-sequences +Version: v1.0.2 +License type (autodetected): MIT +./vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE: +-------------------------------------------------------------------- +(The MIT License) -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +Copyright (c) 2017 marvin + konsorten GmbH (open-source@konsorten.de) -* Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/ishidawataru/sctp -Revision: 7c296d48a2b553e41cc06904a1e6317a20694dc0 -License type (autodetected): Apache-2.0 -./vendor/github.com/ishidawataru/sctp/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: github.com/jcmturner/gofork -Revision: dc7c13fece037a4a36e2b3c69db4991498d30692 -License type (autodetected): BSD-3-Clause -./vendor/github.com/jcmturner/gofork/LICENSE: +Dependency: github.com/lib/pq +Version: v1.1.2 +Revision: 2ff3cb3adc01 +License type (autodetected): MIT +./vendor/github.com/lib/pq/LICENSE.md: -------------------------------------------------------------------- -Copyright (c) 2009 The Go Authors. All rights reserved. +Copyright (c) 2011-2013, 'pq' Contributors +Portions Copyright (C) 2011 Blake Mizerany -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/jmespath/go-jmespath -Version: 0.2.2 -Revision: 3433f3ea46d9f8019119e7dd41274e112a2359a9 +Dependency: github.com/magefile/mage +Version: v1.9.0 License type (autodetected): Apache-2.0 -./vendor/github.com/jmespath/go-jmespath/LICENSE: +./vendor/github.com/magefile/mage/LICENSE: -------------------------------------------------------------------- Apache License 2.0 -------------------------------------------------------------------- -Dependency: github.com/jmoiron/sqlx -Revision: d7d95172beb5a538ff08c50a6e98aee6e7c41f40 +Dependency: github.com/mailru/easyjson +Version: v0.7.1 License type (autodetected): MIT -./vendor/github.com/jmoiron/sqlx/LICENSE: +./vendor/github.com/mailru/easyjson/LICENSE: -------------------------------------------------------------------- - Copyright (c) 2013, Jason Moiron - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: +Copyright (c) 2016 Mail.Ru Group - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/joeshaw/multierror -Revision: 69b34d4ec901851247ae7e77d33909caf9df99ed +Dependency: github.com/Masterminds/semver +Version: v1.4.2 License type (autodetected): MIT -./vendor/github.com/joeshaw/multierror/LICENSE: +./vendor/github.com/Masterminds/semver/LICENSE.txt: -------------------------------------------------------------------- -The MIT License (MIT) - -Copyright (c) 2014 Joe Shaw +The Masterminds +Copyright (C) 2014-2015, Matt Butcher and Matt Farina Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -4729,14 +4648,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/jpillora/backoff -Revision: d80867952dff4e2fbfb4280ded4ff94d67790457 +Dependency: github.com/mattn/go-colorable +Version: v0.0.8 License type (autodetected): MIT -./vendor/github.com/jpillora/backoff/LICENSE: +./vendor/github.com/mattn/go-colorable/LICENSE: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2017 Jaime Pillora +Copyright (c) 2016 Yasuhiro Matsumoto Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -4757,14 +4676,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/json-iterator/go -Revision: 27518f6661eba504be5a7a9a9f6d9460d892ade3 +Dependency: github.com/mattn/go-ieproxy +Revision: 7c0f6868bffe License type (autodetected): MIT -./vendor/github.com/json-iterator/go/LICENSE: +./vendor/github.com/mattn/go-ieproxy/LICENSE: -------------------------------------------------------------------- MIT License -Copyright (c) 2016 json-iterator +Copyright (c) 2014 mattn +Copyright (c) 2017 oliverpool +Copyright (c) 2019 Adele Reed Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -4785,75 +4706,30 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/jstemmer/go-junit-report -Revision: 385fac0ced9acaae6dc5b39144194008ded00697 +Dependency: github.com/mattn/go-isatty +Version: v0.0.2 License type (autodetected): MIT -./vendor/github.com/jstemmer/go-junit-report/LICENSE: +./vendor/github.com/mattn/go-isatty/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2012 Joel Stemmer - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright (c) Yasuhiro MATSUMOTO --------------------------------------------------------------------- -Dependency: github.com/klauspost/compress -Revision: 14c9a76e3c95e47f8ccce949bba2c1101a8b85e6 -License type (autodetected): BSD-3-Clause -./vendor/github.com/klauspost/compress/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2012 The Go Authors. All rights reserved. +MIT License (Expat) -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/klauspost/cpuid -Revision: 09cded8978dc9e80714c4d85b0322337b0a1e5e0 +Dependency: github.com/mattn/go-shellwords +Version: v1.0.7 License type (autodetected): MIT -./vendor/github.com/klauspost/cpuid/LICENSE: +./vendor/github.com/mattn/go-shellwords/LICENSE: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2015 Klaus Post +Copyright (c) 2017 Yasuhiro Matsumoto Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -4873,104 +4749,28 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------- -Dependency: github.com/klauspost/crc32 -Revision: 1bab8b35b6bb565f92cbc97939610af9369f942a -License type (autodetected): BSD-3-Clause -./vendor/github.com/klauspost/crc32/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) 2015 Klaus Post - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- -Dependency: github.com/konsorten/go-windows-terminal-sequences -Revision: f55edac94c9bbba5d6182a4be46d86a2c9b5b50e -License type (autodetected): MIT -./vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE: --------------------------------------------------------------------- -(The MIT License) - -Copyright (c) 2017 marvin + konsorten GmbH (open-source@konsorten.de) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------- -Dependency: github.com/lib/pq -Revision: 2ff3cb3adc01768e0a552b3a02575a6df38a9bea -License type (autodetected): MIT -./vendor/github.com/lib/pq/LICENSE.md: --------------------------------------------------------------------- -Copyright (c) 2011-2013, 'pq' Contributors -Portions Copyright (C) 2011 Blake Mizerany - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -------------------------------------------------------------------- -Dependency: github.com/magefile/mage -Version: v1.9.0 -Revision: 1c36bf78a98209d91af71354deb001cca75e11fc +Dependency: github.com/matttproud/golang_protobuf_extensions +Version: v1.0.2 +Revision: c182affec369 License type (autodetected): Apache-2.0 -./vendor/github.com/magefile/mage/LICENSE: +./vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE: -------------------------------------------------------------------- Apache License 2.0 +-------NOTICE----- +Copyright 2012 Matt T. Proud (matt.proud@gmail.com) -------------------------------------------------------------------- -Dependency: github.com/mailru/easyjson -Revision: 8edcc4e51f39ddbd3505a3386aff3f435a7fd028 +Dependency: github.com/Microsoft/go-winio +Version: v0.4.15 +Revision: fc70bd9a86b5 License type (autodetected): MIT -./vendor/github.com/mailru/easyjson/LICENSE: +./vendor/github.com/Microsoft/go-winio/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2016 Mail.Ru Group - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The MIT License (MIT) --------------------------------------------------------------------- -Dependency: github.com/Masterminds/semver -Revision: 910aa146bd66780c2815d652b92a7fc5331e533c -License type (autodetected): MIT -./vendor/github.com/Masterminds/semver/LICENSE.txt: --------------------------------------------------------------------- -Copyright (C) 2014-2019, Matt Butcher and Matt Farina +Copyright (c) 2015 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -4979,26 +4779,27 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + -------------------------------------------------------------------- -Dependency: github.com/mattn/go-colorable -Revision: 941b50ebc6efddf4c41c8e4537a5f68a4e686b24 +Dependency: github.com/Microsoft/hcsshim +Version: v0.8.7 License type (autodetected): MIT -./vendor/github.com/mattn/go-colorable/LICENSE: +./vendor/github.com/Microsoft/hcsshim/LICENSE: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2016 Yasuhiro Matsumoto +Copyright (c) 2015 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -5017,18 +4818,54 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -------------------------------------------------------------------- -Dependency: github.com/mattn/go-ieproxy -Revision: 7c0f6868bffe087073376feaab3ace57f2ef90b2 -License type (autodetected): MIT -./vendor/github.com/mattn/go-ieproxy/LICENSE: +Dependency: github.com/miekg/dns +Version: v1.1.15 +License type (autodetected): BSD-3-Clause +./vendor/github.com/miekg/dns/LICENSE: -------------------------------------------------------------------- -MIT License +Extensions of the original work are copyright (c) 2011 Miek Gieben -Copyright (c) 2014 mattn -Copyright (c) 2017 oliverpool -Copyright (c) 2019 Adele Reed +As this is fork of the official Go code the same license applies: + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +-------------------------------------------------------------------- +Dependency: github.com/mitchellh/go-homedir +Version: v1.1.0 +License type (autodetected): MIT +./vendor/github.com/mitchellh/go-homedir/LICENSE: +-------------------------------------------------------------------- +The MIT License (MIT) + +Copyright (c) 2013 Mitchell Hashimoto Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -5037,150 +4874,407 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/mattn/go-isatty -Revision: fc9e8d8ef48496124e79ae0df75490096eccf6fe -License type (autodetected): MIT -./vendor/github.com/mattn/go-isatty/LICENSE: +Dependency: github.com/mitchellh/gox +Version: v1.0.1 +License type (autodetected): MPL-2.0 +./vendor/github.com/mitchellh/gox/LICENSE: -------------------------------------------------------------------- -Copyright (c) Yasuhiro MATSUMOTO +Mozilla Public License Version 2.0 +================================== -MIT License (Expat) +1. Definitions +-------------- -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +1.3. "Contribution" + means Covered Software of a particular Contributor. --------------------------------------------------------------------- -Dependency: github.com/matttproud/golang_protobuf_extensions -Revision: c182affec369e30f25d3eb8cd8a478dee585ae7d -License type (autodetected): Apache-2.0 -./vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. --------NOTICE----- -Copyright 2012 Matt T. Proud (matt.proud@gmail.com) +1.5. "Incompatible With Secondary Licenses" + means --------------------------------------------------------------------- -Dependency: github.com/Microsoft/go-winio -Version: v0.4.14 -Revision: 6c72808b55902eae4c5943626030429ff20f3b63 -License type (autodetected): MIT -./vendor/github.com/Microsoft/go-winio/LICENSE: --------------------------------------------------------------------- -The MIT License (MIT) + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or -Copyright (c) 2015 Microsoft + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +1.6. "Executable Form" + means any form of the work other than Source Code Form. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +1.8. "License" + means this document. +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. --------------------------------------------------------------------- -Dependency: github.com/Microsoft/hcsshim -Revision: 84b0c364e1e3bb91e43b85bf20d72e7948666817 -License type (autodetected): MIT -./vendor/github.com/Microsoft/hcsshim/LICENSE: --------------------------------------------------------------------- -The MIT License (MIT) +1.10. "Modifications" + means any of the following: -Copyright (c) 2015 Microsoft + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + (b) any new file in Source Code Form that contains any Covered + Software. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. --------------------------------------------------------------------- -Dependency: github.com/miekg/dns -Version: v1.1.15 -Revision: b13675009d59c97f3721247d9efa8914e1866a5b -License type (autodetected): BSD-3-Clause -./vendor/github.com/miekg/dns/LICENSE: --------------------------------------------------------------------- -Extensions of the original work are copyright (c) 2011 Miek Gieben +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. -As this is fork of the official Go code the same license applies: +1.13. "Source Code Form" + means the form of the work preferred for making modifications. -Copyright (c) 2009 The Go Authors. All rights reserved. +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. -------------------------------------------------------------------- -Dependency: github.com/mitchellh/go-homedir -Revision: af06845cf3004701891bf4fdb884bfe4920b3727 +Dependency: github.com/mitchellh/hashstructure +Revision: ab25296c0f51 License type (autodetected): MIT -./vendor/github.com/mitchellh/go-homedir/LICENSE: +./vendor/github.com/mitchellh/hashstructure/LICENSE: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2013 Mitchell Hashimoto +Copyright (c) 2016 Mitchell Hashimoto Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -5201,14 +5295,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: github.com/mitchellh/hashstructure -Revision: ab25296c0f51f1022f01cd99dfb45f1775de8799 +Dependency: github.com/mitchellh/iochan +Version: v1.0.0 License type (autodetected): MIT -./vendor/github.com/mitchellh/hashstructure/LICENSE: +./vendor/github.com/mitchellh/iochan/LICENSE.md: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2016 Mitchell Hashimoto +Copyright (c) 2015 Mitchell Hashimoto Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -5231,7 +5325,6 @@ THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/mitchellh/mapstructure Version: v1.1.2 -Revision: 3536a929edddb9a5b34bd6861dc4a9647cb459fe License type (autodetected): MIT ./vendor/github.com/mitchellh/mapstructure/LICENSE: -------------------------------------------------------------------- @@ -5259,7 +5352,7 @@ THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/modern-go/concurrent -Revision: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 +Revision: bacd9c7ef1dd License type (autodetected): Apache-2.0 ./vendor/github.com/modern-go/concurrent/LICENSE: -------------------------------------------------------------------- @@ -5268,7 +5361,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/modern-go/reflect2 -Revision: 94122c33edd36123c84d5368cfb2b69df93a0ec8 +Version: v1.0.1 License type (autodetected): Apache-2.0 ./vendor/github.com/modern-go/reflect2/LICENSE: -------------------------------------------------------------------- @@ -5277,7 +5370,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/morikuni/aec -Revision: 39771216ff4c63d11f5e604076f9c45e8be1067b +Version: v1.0.0 License type (autodetected): MIT ./vendor/github.com/morikuni/aec/LICENSE: -------------------------------------------------------------------- @@ -5305,7 +5398,8 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/opencontainers/go-digest -Revision: ac19fd6e7483ff933754af248d80be865e543d22 +Version: v1.0.0 +Revision: ac19fd6e7483 License type (autodetected): Apache-2.0 ./vendor/github.com/opencontainers/go-digest/LICENSE: -------------------------------------------------------------------- @@ -5314,7 +5408,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/opencontainers/image-spec -Revision: 775207bd45b6cb8153ce218cc59351799217451f +Version: v1.0.2 +Revision: 775207bd45b6 License type (autodetected): Apache-2.0 ./vendor/github.com/opencontainers/image-spec/LICENSE: -------------------------------------------------------------------- @@ -5324,7 +5419,6 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/opencontainers/runc Version: v1.0.0-rc9 -Revision: d736ef14f0288d6993a1845745d6756cfc9ddd5a License type (autodetected): Apache-2.0 ./vendor/github.com/opencontainers/runc/LICENSE: -------------------------------------------------------------------- @@ -5351,7 +5445,7 @@ See also http://www.apache.org/dev/crypto.html and/or seek legal counsel. -------------------------------------------------------------------- Dependency: github.com/pierrec/lz4 -Revision: 90290f74b1b4d9c097f0a3b3c7eba2ef3875c699 +Version: v2.2.6 License type (autodetected): BSD-3-Clause ./vendor/github.com/pierrec/lz4/LICENSE: -------------------------------------------------------------------- @@ -5384,44 +5478,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -Dependency: github.com/pierrec/xxHash -Revision: 5a004441f897722c627870a981d02b29924215fa -License type (autodetected): BSD-3-Clause -./vendor/github.com/pierrec/xxHash/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2014, Pierre Curto -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of xxHash nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -------------------------------------------------------------------- Dependency: github.com/pierrre/gotestcover -Revision: 7b94f124d338b6ae06df22bc2ee7909af27aae85 +Revision: 7b94f124d338 License type (autodetected): MIT ./vendor/github.com/pierrre/gotestcover/LICENSE: -------------------------------------------------------------------- @@ -5434,7 +5493,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/pkg/errors -Revision: ff09b135c25aae272398c51a07235b90a75aa4f0 +Version: v0.9.1 License type (autodetected): BSD-2-Clause ./vendor/github.com/pkg/errors/LICENSE: -------------------------------------------------------------------- @@ -5465,7 +5524,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/pmezard/go-difflib Version: v1.0.0 -Revision: 792786c7400a136282c1664665ae0a8db921c6c2 License type (autodetected): BSD-2-Clause ./vendor/github.com/pmezard/go-difflib/LICENSE: -------------------------------------------------------------------- @@ -5499,7 +5557,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/prometheus/client_golang -Revision: 20428fa0bffcb4ee7a7941545ae0df9acdc9d8a7 +Version: v1.1.1 +Revision: 20428fa0bffc License type (autodetected): Apache-2.0 ./vendor/github.com/prometheus/client_golang/LICENSE: -------------------------------------------------------------------- @@ -5532,6 +5591,7 @@ Licensed under the Apache License, Version 2.0 -------------------------------------------------------------------- Dependency: github.com/prometheus/client_model +Revision: 14fe0d1b01d4 License type (autodetected): Apache-2.0 ./vendor/github.com/prometheus/client_model/LICENSE: -------------------------------------------------------------------- @@ -5546,7 +5606,7 @@ SoundCloud Ltd. (http://soundcloud.com/). -------------------------------------------------------------------- Dependency: github.com/prometheus/common -Revision: 637d7c34db122e2d1a25d061423098663758d2d3 +Version: v0.7.0 License type (autodetected): Apache-2.0 ./vendor/github.com/prometheus/common/LICENSE: -------------------------------------------------------------------- @@ -5561,7 +5621,8 @@ SoundCloud Ltd. (http://soundcloud.com/). -------------------------------------------------------------------- Dependency: github.com/prometheus/procfs -Revision: 42f6e295b56f795825f88add3c95f83aedb744a4 +Version: v0.0.9 +Revision: 42f6e295b56f License type (autodetected): Apache-2.0 ./vendor/github.com/prometheus/procfs/LICENSE: -------------------------------------------------------------------- @@ -5578,7 +5639,7 @@ SoundCloud Ltd. (http://soundcloud.com/). -------------------------------------------------------------------- Dependency: github.com/rcrowley/go-metrics -Revision: 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd +Revision: 3113b8401b8a License type (autodetected): BSD-2-Clause ./vendor/github.com/rcrowley/go-metrics/LICENSE: -------------------------------------------------------------------- @@ -5613,40 +5674,64 @@ are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Richard Crowley. -------------------------------------------------------------------- -Dependency: github.com/samuel/go-parser -Revision: ca8abbf65d0e61dedf061f98bd3850f250e27539 -License type (autodetected): BSD-3-Clause -./vendor/github.com/samuel/go-parser/LICENSE: +Dependency: github.com/reviewdog/errorformat +Revision: 8983be9bc7dd +License type (autodetected): MIT +./vendor/github.com/reviewdog/errorformat/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2013, Samuel Stauffer -All rights reserved. +MIT License -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Copyright (c) 2016 haya14busa -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name of the author nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +-------------------------------------------------------------------- +Dependency: github.com/reviewdog/reviewdog +Version: v0.9.17 +License type (autodetected): MIT +./vendor/github.com/reviewdog/reviewdog/LICENSE: +-------------------------------------------------------------------- +MIT License + +Copyright (c) 2016 haya14busa + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/samuel/go-thrift -Revision: 2187045faa54fce7f5028706ffeb2f2fc342aa7e +Revision: 2187045faa54 License type (autodetected): BSD-3-Clause ./vendor/github.com/samuel/go-thrift/LICENSE: -------------------------------------------------------------------- @@ -5678,8 +5763,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/sanathkr/go-yaml -Version: v2 -Revision: ed9d249f429b3f5a69f80a7abef6bfce81fef894 +Revision: ed9d249f429b License type (autodetected): Apache-2.0 ./vendor/github.com/sanathkr/go-yaml/LICENSE: -------------------------------------------------------------------- @@ -5688,8 +5772,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/sanathkr/go-yaml -Version: v2 -Revision: ed9d249f429b3f5a69f80a7abef6bfce81fef894 +Revision: ed9d249f429b License type (autodetected): MIT ./vendor/github.com/sanathkr/go-yaml/LICENSE.libyaml: -------------------------------------------------------------------- @@ -5727,7 +5810,8 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/sanathkr/yaml -Revision: 0056894fa522748ca336761ffeeeb6bbae654d07 +Version: v1.0.1 +Revision: 0056894fa522 License type (autodetected): MIT ./vendor/github.com/sanathkr/yaml/LICENSE: -------------------------------------------------------------------- @@ -5785,7 +5869,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/shirou/gopsutil Version: v2.19.11 -Revision: fc7e5e7af6052e36e83e5539148015ed2c09d8f9 License type (autodetected): BSD-3-Clause ./vendor/github.com/shirou/gopsutil/LICENSE: -------------------------------------------------------------------- @@ -5850,40 +5933,10 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -Dependency: github.com/shirou/w32 -Revision: bb4de0191aa41b5507caa14b0650cdbddcd9280b -License type (autodetected): BSD-2-Clause -./vendor/github.com/shirou/w32/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2010-2012 The w32 Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------- Dependency: github.com/Shopify/sarama -Version: v1.23.1 -Revision: 46c83074a05474240f9620fb7c70fb0d80ca401a +Overwrite: github.com/elastic/sarama +Overwrite-Revision: 355d120d0970 License type (autodetected): MIT ./vendor/github.com/Shopify/sarama/LICENSE: -------------------------------------------------------------------- @@ -5910,7 +5963,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/sirupsen/logrus -Revision: a6c0064cfaf982707445a1c90368f956421ebcf0 +Version: v1.4.2 License type (autodetected): MIT ./vendor/github.com/sirupsen/logrus/LICENSE: -------------------------------------------------------------------- @@ -5938,7 +5991,7 @@ THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/spf13/cobra -Revision: 1be1d2841c773c01bee8289f55f7463b6e2c2539 +Version: v0.0.3 License type (autodetected): Apache-2.0 ./vendor/github.com/spf13/cobra/LICENSE.txt: -------------------------------------------------------------------- @@ -5947,7 +6000,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/spf13/pflag -Revision: e57e3eeb33f795204c1ca35f56c44f83227c6e66 +Version: v1.0.3 License type (autodetected): BSD-3-Clause ./vendor/github.com/spf13/pflag/LICENSE: -------------------------------------------------------------------- @@ -5982,7 +6035,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/StackExchange/wmi -Revision: 9f32b5905fd6ce7384093f9d048437e79f7b4d85 +Revision: 9f32b5905fd6 License type (autodetected): MIT ./vendor/github.com/StackExchange/wmi/LICENSE: -------------------------------------------------------------------- @@ -6009,7 +6062,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/stretchr/objx -Revision: b8b73a35e9830ae509858c10dec5866b4d5c8bff +Version: v0.1.2 +Revision: b8b73a35e983 License type (autodetected): MIT ./vendor/github.com/stretchr/objx/LICENSE: -------------------------------------------------------------------- @@ -6038,37 +6092,35 @@ SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/stretchr/testify -Version: v1.2.2 -Revision: f35b8ab0b5a2cef36673838d662e249dd9c94686 +Version: v1.4.0 License type (autodetected): MIT ./vendor/github.com/stretchr/testify/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell +MIT License -Please consider promoting this project if you find it useful. +Copyright (c) 2012-2018 Mat Ryer and Tyler Bunnell -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -------------------------------------------------------------------- Dependency: github.com/tsg/go-daemon -Revision: c6e0d1a849861166320520e9bae9bbda5f2ecb03 +Revision: e704b93fd89b License type (autodetected): BSD-2-Clause ./vendor/github.com/tsg/go-daemon/LICENSE: -------------------------------------------------------------------- @@ -6102,7 +6154,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/tsg/gopacket -Revision: 7c5392a5f2b5c5fa393c71e1f9064e22b5408995 +Revision: dd3d0e41124a License type (autodetected): BSD-3-Clause ./vendor/github.com/tsg/gopacket/LICENSE: -------------------------------------------------------------------- @@ -6137,7 +6189,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: github.com/urso/go-bin -Revision: 781c575c9f0eb3cb9dca94521bd7ad7d5aec7fd4 +Revision: 781c575c9f0e License type (autodetected): Apache-2.0 ./vendor/github.com/urso/go-bin/LICENSE: -------------------------------------------------------------------- @@ -6146,25 +6198,16 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/urso/magetools -Revision: 61080ed7b22b35d276d023e17437c85d8a5ade51 +Revision: 61080ed7b22b License type (autodetected): Apache-2.0 ./vendor/github.com/urso/magetools/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: github.com/urso/qcgen -Revision: 0b059e7db4f40a062ca3d975b7500c6a0a968d87 -License type (autodetected): Apache-2.0 -./vendor/github.com/urso/qcgen/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - -------------------------------------------------------------------- Dependency: github.com/vmware/govmomi -Revision: 2cad15190b417804d82edb4981e7b3e62907c4ee +Revision: 2cad15190b41 License type (autodetected): Apache-2.0 ./vendor/github.com/vmware/govmomi/LICENSE.txt: -------------------------------------------------------------------- @@ -6173,7 +6216,6 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/vmware/govmomi/vim25/xml -Revision: 2cad15190b417804d82edb4981e7b3e62907c4ee License type (autodetected): BSD-3-Clause ./vendor/github.com/vmware/govmomi/vim25/xml/LICENSE: -------------------------------------------------------------------- @@ -6206,14 +6248,23 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: github.com/weppos/publicsuffix-go -Revision: 120738c23213637160ef8bdcfae4b10bf42bfffc +Dependency: github.com/xanzy/go-gitlab +Version: v0.22.3 +License type (autodetected): Apache-2.0 +./vendor/github.com/xanzy/go-gitlab/LICENSE: +-------------------------------------------------------------------- +Apache License 2.0 + + +-------------------------------------------------------------------- +Dependency: github.com/yuin/gopher-lua +Revision: b402f3114ec7 License type (autodetected): MIT -./vendor/github.com/weppos/publicsuffix-go/LICENSE.txt: +./vendor/github.com/yuin/gopher-lua/LICENSE: -------------------------------------------------------------------- The MIT License (MIT) -Copyright (c) 2016-2018 Simone Carletti +Copyright (c) 2015 Yusuke Inuzuka Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -6232,33 +6283,23 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------- -Dependency: github.com/xdg/scram -Revision: 7eeb5667e42c09cb51bf7b7c28aea8c56767da90 -License type (autodetected): Apache-2.0 -./vendor/github.com/xdg/scram/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - -------------------------------------------------------------------- -Dependency: github.com/xdg/stringprep -Revision: 73f8eece6fdcd902c185bf651de50f3828bed5ed +Dependency: go.opencensus.io +Version: v0.22.2 License type (autodetected): Apache-2.0 -./vendor/github.com/xdg/stringprep/LICENSE: +./vendor/go.opencensus.io/LICENSE: -------------------------------------------------------------------- Apache License 2.0 -------------------------------------------------------------------- -Dependency: github.com/yuin/gopher-lua -Revision: b402f3114ec730d8bddb074a6c137309f561aa78 +Dependency: go.uber.org/atomic +Version: v1.3.1 License type (autodetected): MIT -./vendor/github.com/yuin/gopher-lua/LICENSE: +./vendor/go.uber.org/atomic/LICENSE.txt: -------------------------------------------------------------------- -The MIT License (MIT) - -Copyright (c) 2015 Yusuke Inuzuka +Copyright (c) 2016 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -6267,43 +6308,25 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - --------------------------------------------------------------------- -Dependency: github.com/zmap/zlint -Revision: 5dcecad773158b82b5e52064ee2782d1b8a79314 -License type (autodetected): Apache-2.0 -./vendor/github.com/zmap/zlint/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - - --------------------------------------------------------------------- -Dependency: go.opencensus.io -Version: v0.22.0 -Revision: 9c377598961b706d1542bd2d84d538b5094d596e -License type (autodetected): Apache-2.0 -./vendor/go.opencensus.io/LICENSE: --------------------------------------------------------------------- -Apache License 2.0 - +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -------------------------------------------------------------------- -Dependency: go.uber.org/atomic -Revision: 8474b86a5a6f79c443ce4b2992817ff32cf208b8 +Dependency: go.uber.org/multierr +Version: v1.1.1 +Revision: fb7d312c2c04 License type (autodetected): MIT -./vendor/go.uber.org/atomic/LICENSE.txt: +./vendor/go.uber.org/multierr/LICENSE.txt: -------------------------------------------------------------------- -Copyright (c) 2016 Uber Technologies, Inc. +Copyright (c) 2017 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -6324,12 +6347,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: go.uber.org/multierr -Revision: fb7d312c2c04c34f0ad621048bbb953b168f9ff6 +Dependency: go.uber.org/zap +Version: v1.7.1 License type (autodetected): MIT -./vendor/go.uber.org/multierr/LICENSE.txt: +./vendor/go.uber.org/zap/LICENSE.txt: -------------------------------------------------------------------- -Copyright (c) 2017 Uber Technologies, Inc. +Copyright (c) 2016-2017 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -6350,40 +6373,80 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- -Dependency: go.uber.org/zap -Version: v1.7.1 -Revision: 35aad584952c3e7020db7b839f6b102de6271f89 -License type (autodetected): MIT -./vendor/go.uber.org/zap/LICENSE.txt: +Dependency: golang.org/x/crypto +Revision: c9f3fb736b72 +License type (autodetected): BSD-3-Clause +./vendor/golang.org/x/crypto/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- +Dependency: golang.org/x/exp +Revision: da58074b4299 +License type (autodetected): BSD-3-Clause +./vendor/golang.org/x/exp/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2016-2017 Uber Technologies, Inc. +Copyright (c) 2009 The Go Authors. All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- -Dependency: golang.org/x/crypto -Version: release-branch.go1.13 -Revision: 60c769a6c58655dab1b9adac0d58967dd517cfba +Dependency: golang.org/x/lint +Revision: fdd1cda4f05f License type (autodetected): BSD-3-Clause -./vendor/golang.org/x/crypto/LICENSE: +./vendor/golang.org/x/lint/LICENSE: -------------------------------------------------------------------- -Copyright (c) 2009 The Go Authors. All rights reserved. +Copyright (c) 2013 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -6413,8 +6476,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/net -Version: release-branch.go1.13 -Revision: 13f9640d40b9cc418fb53703dfbd177679788ceb +Revision: 16171245cfb2 License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/net/LICENSE: -------------------------------------------------------------------- @@ -6448,7 +6510,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/oauth2 -Revision: 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 +Revision: bf48bf16ab8d License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/oauth2/LICENSE: -------------------------------------------------------------------- @@ -6482,7 +6544,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/sync -Revision: 112230192c580c3556b8cee6403af37a4fc5f28c +Revision: cd5d95a43a6e License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/sync/LICENSE: -------------------------------------------------------------------- @@ -6516,8 +6578,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/sys -Version: release-branch.go1.13 -Revision: fde4db37ae7ad8191b03d30d27f258b5291ae4e3 +Revision: c96a22e43c9c License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/sys/LICENSE: -------------------------------------------------------------------- @@ -6551,8 +6612,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/text -Version: release-branch.go1.13 -Revision: 342b2e1fbaa52c93f31447ad2c6abc048c63e475 +Version: v0.3.2 License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/text/LICENSE: -------------------------------------------------------------------- @@ -6586,8 +6646,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/time -Version: release-branch.go1.13 -Revision: 555d28b269f0569763d25dbe1a237ae74c6bcc82 +Revision: 555d28b269f0 License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/time/LICENSE: -------------------------------------------------------------------- @@ -6621,8 +6680,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/tools -Version: release-branch.go1.13 -Revision: 65e3620a7ae7ac25e8494a60f0e5ef4e4fba03b3 +Revision: 7b8e75db28f4 License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/tools/LICENSE: -------------------------------------------------------------------- @@ -6656,7 +6714,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: golang.org/x/xerrors -Revision: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +Revision: 9bdfabe68543 License type (autodetected): BSD-3-Clause ./vendor/golang.org/x/xerrors/LICENSE: -------------------------------------------------------------------- @@ -6690,8 +6748,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: google.golang.org/api -Version: v0.7.0 -Revision: 02490b97dff7cfde1995bd77de808fd27053bc87 +Version: v0.15.0 License type (autodetected): BSD-3-Clause ./vendor/google.golang.org/api/LICENSE: -------------------------------------------------------------------- @@ -6723,36 +6780,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- -Dependency: google.golang.org/api/googleapi/internal/uritemplates -Version: v0.7.0 -Revision: 02490b97dff7cfde1995bd77de808fd27053bc87 -License type (autodetected): MIT -./vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE: --------------------------------------------------------------------- -Copyright (c) 2013 Joshua Tacoma - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -------------------------------------------------------------------- Dependency: google.golang.org/api/internal/third_party/uritemplates -Version: v0.14.0 -Revision: 8a410c21381766a810817fd6200fce8838ecb277 License type (autodetected): BSD-3-Clause ./vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE: -------------------------------------------------------------------- @@ -6786,8 +6815,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: google.golang.org/appengine -Version: v1.6.1 -Revision: b2f4a3cf3c67576a2ee09e1fe62656a5086ce880 +Version: v1.6.5 License type (autodetected): Apache-2.0 ./vendor/google.golang.org/appengine/LICENSE: -------------------------------------------------------------------- @@ -6796,7 +6824,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: google.golang.org/genproto -Revision: 83cc0476cb11ea0da33dacd4c6354ab192de6fe6 +Revision: f3c370f40bfb License type (autodetected): Apache-2.0 ./vendor/google.golang.org/genproto/LICENSE: -------------------------------------------------------------------- @@ -6805,45 +6833,16 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: google.golang.org/grpc -Version: v1.25.1 -Revision: 1a3960e4bd028ac0cec0a2afd27d7d8e67c11514 +Version: v1.27.1 License type (autodetected): Apache-2.0 ./vendor/google.golang.org/grpc/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: gopkg.in/hjson/hjson-go.v3 -Revision: 8f44e1182a33737b57cb6855fe656ece998e9b3c -License type (autodetected): MIT -./vendor/gopkg.in/hjson/hjson-go.v3/LICENSE: --------------------------------------------------------------------- -MIT License - -Copyright (c) 2016, 2017 Christian Zangl - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -------------------------------------------------------------------- Dependency: gopkg.in/inf.v0 -Revision: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 +Version: v0.9.0 License type (autodetected): BSD-3-Clause ./vendor/gopkg.in/inf.v0/LICENSE: -------------------------------------------------------------------- @@ -6878,7 +6877,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: gopkg.in/jcmturner/aescts.v1 -Revision: f6abebb3171c4c1b1fea279cb7c7325020a26290 +Version: v1.0.1 License type (autodetected): Apache-2.0 ./vendor/gopkg.in/jcmturner/aescts.v1/LICENSE: -------------------------------------------------------------------- @@ -6887,7 +6886,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: gopkg.in/jcmturner/dnsutils.v1 -Revision: 13eeb8d49ffb74d7a75784c35e4d900607a3943c +Version: v1.0.1 License type (autodetected): Apache-2.0 ./vendor/gopkg.in/jcmturner/dnsutils.v1/LICENSE: -------------------------------------------------------------------- @@ -6896,7 +6895,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: gopkg.in/jcmturner/gokrb5.v7 -Revision: 363118e62befa8a14ff01031c025026077fe5d6d +Version: v7.3.0 License type (autodetected): Apache-2.0 ./vendor/gopkg.in/jcmturner/gokrb5.v7/LICENSE: -------------------------------------------------------------------- @@ -6905,7 +6904,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: gopkg.in/jcmturner/rpc.v1 -Revision: 99a8ce2fbf8b8087b6ed12a37c61b10f04070043 +Version: v1.1.0 License type (autodetected): Apache-2.0 ./vendor/gopkg.in/jcmturner/rpc.v1/LICENSE: -------------------------------------------------------------------- @@ -6914,7 +6913,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: gopkg.in/mgo.v2 -Revision: 3f83fa5005286a7fe593b055f0d7771a7dce4655 +Version: v2.0.0 +Revision: 3f83fa500528 License type (autodetected): BSD-2-Clause ./vendor/gopkg.in/mgo.v2/LICENSE: -------------------------------------------------------------------- @@ -6946,7 +6946,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: gopkg.in/mgo.v2/bson -Revision: 3f83fa5005286a7fe593b055f0d7771a7dce4655 License type (autodetected): BSD-2-Clause ./vendor/gopkg.in/mgo.v2/bson/LICENSE: -------------------------------------------------------------------- @@ -6978,7 +6977,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: gopkg.in/mgo.v2/internal/json -Revision: 3f83fa5005286a7fe593b055f0d7771a7dce4655 License type (autodetected): BSD-3-Clause ./vendor/gopkg.in/mgo.v2/internal/json/LICENSE: -------------------------------------------------------------------- @@ -7012,7 +7010,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: gopkg.in/yaml.v2 -Revision: 5420a8b6744d3b0345ab293f6fcba19c978f1183 +Version: v2.2.7 License type (autodetected): Apache-2.0 ./vendor/gopkg.in/yaml.v2/LICENSE: -------------------------------------------------------------------- @@ -7035,7 +7033,7 @@ limitations under the License. -------------------------------------------------------------------- Dependency: gopkg.in/yaml.v2 -Revision: 5420a8b6744d3b0345ab293f6fcba19c978f1183 +Version: v2.2.7 License type (autodetected): MIT ./vendor/gopkg.in/yaml.v2/LICENSE.libyaml: -------------------------------------------------------------------- @@ -7071,9 +7069,337 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------- +Dependency: honnef.co/go/tools +Version: v0.0.1-2019.2.3 +License type (autodetected): MIT +./vendor/honnef.co/go/tools/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2016 Dominik Honnef + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------- +Dependency: honnef.co/go/tools +Version: v0.0.1-2019.2.3 +License type (autodetected): BSD-3-Clause +./vendor/honnef.co/go/tools/LICENSE-THIRD-PARTY: +-------------------------------------------------------------------- +Staticcheck and its related tools make use of third party projects, +either by reusing their code, or by statically linking them into +resulting binaries. These projects are: + +* The Go Programming Language - https://golang.org/ + + Copyright (c) 2009 The Go Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +* github.com/BurntSushi/toml - https://github.com/BurntSushi/toml + + The MIT License (MIT) + + Copyright (c) 2013 TOML authors + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + +* github.com/google/renameio - https://github.com/google/renameio + + Copyright 2018 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +* github.com/kisielk/gotool – https://github.com/kisielk/gotool + + Copyright (c) 2013 Kamil Kisiel + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + All the files in this distribution are covered under either the MIT + license (see the file LICENSE) except some files mentioned below. + + match.go, match_test.go: + + Copyright (c) 2009 The Go Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +* github.com/rogpeppe/go-internal - https://github.com/rogpeppe/go-internal + + Copyright (c) 2018 The Go Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +* golang.org/x/mod/module - https://github.com/golang/mod + + Copyright (c) 2009 The Go Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +* golang.org/x/tools/go/analysis - https://github.com/golang/tools + + Copyright (c) 2009 The Go Authors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +-------------------------------------------------------------------- +Dependency: honnef.co/go/tools/lint +License type (autodetected): BSD-3-Clause +./vendor/honnef.co/go/tools/lint/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2013 The Go Authors. All rights reserved. +Copyright (c) 2016 Dominik Honnef. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- +Dependency: honnef.co/go/tools/ssa +License type (autodetected): BSD-3-Clause +./vendor/honnef.co/go/tools/ssa/LICENSE: +-------------------------------------------------------------------- +Copyright (c) 2009 The Go Authors. All rights reserved. +Copyright (c) 2016 Dominik Honnef. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + -------------------------------------------------------------------- Dependency: howett.net/plist -Revision: 233df3c4f07b0c562da0e8a6fb850681ac49bb90 +Revision: 591f970eefbb License type (autodetected): BSD-2-Clause ./vendor/howett.net/plist/LICENSE: -------------------------------------------------------------------- @@ -7138,7 +7464,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- Dependency: k8s.io/api -Revision: b90922c02518d683852c467209bbab0a76db36e0 +Revision: b90922c02518 License type (autodetected): Apache-2.0 ./vendor/k8s.io/api/LICENSE: -------------------------------------------------------------------- @@ -7147,7 +7473,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: k8s.io/apimachinery -Revision: bfcf53abc9f82bad3e534fcb1c36599d3c989ebf +Revision: bfcf53abc9f8 License type (autodetected): Apache-2.0 ./vendor/k8s.io/apimachinery/LICENSE: -------------------------------------------------------------------- @@ -7156,8 +7482,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: k8s.io/client-go -Version: v12.0.0 -Revision: 78d2af792babf2dd937ba2e2a8d99c753a5eda89 +Revision: 78d2af792bab License type (autodetected): Apache-2.0 ./vendor/k8s.io/client-go/LICENSE: -------------------------------------------------------------------- @@ -7166,7 +7491,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: k8s.io/klog -Revision: 6a023d6d0e0954feabd46dc2d3a6a2c3c991fe1a +Version: v0.3.4 +Revision: 6a023d6d0e09 License type (autodetected): Apache-2.0 ./vendor/k8s.io/klog/LICENSE: -------------------------------------------------------------------- @@ -7175,44 +7501,17 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: k8s.io/utils -Revision: 3dccf664f023863740c508fb4284e49742bedfa4 +Revision: 3dccf664f023 License type (autodetected): Apache-2.0 ./vendor/k8s.io/utils/LICENSE: -------------------------------------------------------------------- Apache License 2.0 --------------------------------------------------------------------- -Dependency: pack.ag/amqp -Revision: ddf76e6b06138e7e73606c99f40d6f21a02c0be5 -License type (autodetected): MIT -./vendor/pack.ag/amqp/LICENSE: --------------------------------------------------------------------- -MIT License - -Copyright (C) 2017 Kale Blankenship - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -------------------------------------------------------------------- Dependency: sigs.k8s.io/yaml -Revision: 4cd0c284b15f1735b8cc247df097d262b8903f9f +Version: v1.1.1 +Revision: 4cd0c284b15f License type (autodetected): MIT ./vendor/sigs.k8s.io/yaml/LICENSE: -------------------------------------------------------------------- diff --git a/auditbeat/cmd/root.go b/auditbeat/cmd/root.go index ae0b8e0d0ea2..a16be519cd58 100644 --- a/auditbeat/cmd/root.go +++ b/auditbeat/cmd/root.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) // Name of the beat (auditbeat). diff --git a/auditbeat/core/eventmod.go b/auditbeat/core/eventmod.go index 3dfe57d82d35..662422f7e9da 100644 --- a/auditbeat/core/eventmod.go +++ b/auditbeat/core/eventmod.go @@ -18,8 +18,8 @@ package core import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // AddDatasetToEvent adds dataset information to the event. In particular this diff --git a/auditbeat/datastore/datastore.go b/auditbeat/datastore/datastore.go index 018897ee7bfd..5d06fd502c14 100644 --- a/auditbeat/datastore/datastore.go +++ b/auditbeat/datastore/datastore.go @@ -24,7 +24,7 @@ import ( bolt "github.com/coreos/bbolt" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/auditbeat/helper/hasher/hasher.go b/auditbeat/helper/hasher/hasher.go index a9e3ab19bb91..cc4c928867e8 100644 --- a/auditbeat/helper/hasher/hasher.go +++ b/auditbeat/helper/hasher/hasher.go @@ -30,7 +30,7 @@ import ( "strings" "time" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/dustin/go-humanize" "github.com/joeshaw/multierror" "github.com/pkg/errors" @@ -38,7 +38,7 @@ import ( "golang.org/x/crypto/sha3" "golang.org/x/time/rate" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) // HashType identifies a cryptographic algorithm. diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go index 81c4957de811..a88a625f94dd 100644 --- a/auditbeat/include/fields.go +++ b/auditbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/include/list.go b/auditbeat/include/list.go index 97177fac811d..737124691b12 100644 --- a/auditbeat/include/list.go +++ b/auditbeat/include/list.go @@ -21,6 +21,6 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/auditbeat/module/auditd" - _ "github.com/elastic/beats/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v7/auditbeat/module/auditd" + _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" ) diff --git a/auditbeat/magefile.go b/auditbeat/magefile.go index 74a65087dbc2..e9d80728ac40 100644 --- a/auditbeat/magefile.go +++ b/auditbeat/magefile.go @@ -26,13 +26,13 @@ import ( "github.com/magefile/mage/mg" - auditbeat "github.com/elastic/beats/auditbeat/scripts/mage" - devtools "github.com/elastic/beats/dev-tools/mage" + auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" ) func init() { diff --git a/auditbeat/main.go b/auditbeat/main.go index 3403e3ec0c05..9937e2d42fe1 100644 --- a/auditbeat/main.go +++ b/auditbeat/main.go @@ -20,14 +20,14 @@ package main import ( "os" - "github.com/elastic/beats/auditbeat/cmd" + "github.com/elastic/beats/v7/auditbeat/cmd" // Register modules. - _ "github.com/elastic/beats/auditbeat/module/auditd" - _ "github.com/elastic/beats/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v7/auditbeat/module/auditd" + _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" // Register includes. - _ "github.com/elastic/beats/auditbeat/include" + _ "github.com/elastic/beats/v7/auditbeat/include" ) func main() { diff --git a/auditbeat/main_test.go b/auditbeat/main_test.go index 453fe4d27356..d6e81c2aad2c 100644 --- a/auditbeat/main_test.go +++ b/auditbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/auditbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/auditbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/auditbeat/module/auditd/audit_linux.go b/auditbeat/module/auditd/audit_linux.go index 35b7e683f0c2..1cf0236d7f7a 100644 --- a/auditbeat/module/auditd/audit_linux.go +++ b/auditbeat/module/auditd/audit_linux.go @@ -30,11 +30,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/elastic/go-libaudit" "github.com/elastic/go-libaudit/aucoalesce" "github.com/elastic/go-libaudit/auparse" diff --git a/auditbeat/module/auditd/audit_linux_test.go b/auditbeat/module/auditd/audit_linux_test.go index 6fc4bf4b0dfb..c8da4f06965b 100644 --- a/auditbeat/module/auditd/audit_linux_test.go +++ b/auditbeat/module/auditd/audit_linux_test.go @@ -34,12 +34,12 @@ import ( "github.com/prometheus/procfs" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/go-libaudit" "github.com/elastic/go-libaudit/auparse" ) diff --git a/auditbeat/module/auditd/audit_unsupported.go b/auditbeat/module/auditd/audit_unsupported.go index 23d34b8042e7..94761612928d 100644 --- a/auditbeat/module/auditd/audit_unsupported.go +++ b/auditbeat/module/auditd/audit_unsupported.go @@ -22,8 +22,8 @@ package auditd import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/auditbeat/module/auditd/config_linux_test.go b/auditbeat/module/auditd/config_linux_test.go index c8a5e85fc6b1..8d677fdfcb73 100644 --- a/auditbeat/module/auditd/config_linux_test.go +++ b/auditbeat/module/auditd/config_linux_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigValidate(t *testing.T) { diff --git a/auditbeat/module/auditd/fields.go b/auditbeat/module/auditd/fields.go index 83de724b83d6..5b23bddb2bbd 100644 --- a/auditbeat/module/auditd/fields.go +++ b/auditbeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/module/auditd/show_linux.go b/auditbeat/module/auditd/show_linux.go index f7ce49fdce0c..bcd332eaa7be 100644 --- a/auditbeat/module/auditd/show_linux.go +++ b/auditbeat/module/auditd/show_linux.go @@ -27,7 +27,7 @@ import ( "github.com/elastic/go-libaudit" "github.com/elastic/go-libaudit/rule" - "github.com/elastic/beats/auditbeat/cmd" + "github.com/elastic/beats/v7/auditbeat/cmd" ) var ( diff --git a/auditbeat/module/file_integrity/config.go b/auditbeat/module/file_integrity/config.go index 6b76deb6ac8e..c280fb52d0ef 100644 --- a/auditbeat/module/file_integrity/config.go +++ b/auditbeat/module/file_integrity/config.go @@ -26,7 +26,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) // HashType identifies a cryptographic algorithm. diff --git a/auditbeat/module/file_integrity/config_test.go b/auditbeat/module/file_integrity/config_test.go index 202f186e29d5..c0097fc086e1 100644 --- a/auditbeat/module/file_integrity/config_test.go +++ b/auditbeat/module/file_integrity/config_test.go @@ -26,7 +26,7 @@ import ( "github.com/joeshaw/multierror" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg" ) diff --git a/auditbeat/module/file_integrity/event.go b/auditbeat/module/file_integrity/event.go index 29397ec957fd..61e9b2148193 100644 --- a/auditbeat/module/file_integrity/event.go +++ b/auditbeat/module/file_integrity/event.go @@ -33,14 +33,14 @@ import ( "strconv" "time" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/pkg/errors" "golang.org/x/crypto/blake2b" "golang.org/x/crypto/sha3" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Source identifies the source of an event (i.e. what triggered it). diff --git a/auditbeat/module/file_integrity/event_test.go b/auditbeat/module/file_integrity/event_test.go index 953de9276e89..1d20f1b39655 100644 --- a/auditbeat/module/file_integrity/event_test.go +++ b/auditbeat/module/file_integrity/event_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var testEventTime = time.Now().UTC() diff --git a/auditbeat/module/file_integrity/eventreader_fsevents.go b/auditbeat/module/file_integrity/eventreader_fsevents.go index b355e96eaecf..064c46c101f6 100644 --- a/auditbeat/module/file_integrity/eventreader_fsevents.go +++ b/auditbeat/module/file_integrity/eventreader_fsevents.go @@ -28,7 +28,7 @@ import ( "github.com/fsnotify/fsevents" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type fsreader struct { diff --git a/auditbeat/module/file_integrity/eventreader_fsnotify.go b/auditbeat/module/file_integrity/eventreader_fsnotify.go index b228ebc59a32..4c59191dfe71 100644 --- a/auditbeat/module/file_integrity/eventreader_fsnotify.go +++ b/auditbeat/module/file_integrity/eventreader_fsnotify.go @@ -26,8 +26,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/module/file_integrity/monitor" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/auditbeat/module/file_integrity/monitor" + "github.com/elastic/beats/v7/libbeat/logp" ) type reader struct { diff --git a/auditbeat/module/file_integrity/fields.go b/auditbeat/module/file_integrity/fields.go index 84341850eb5a..c7dce9bc9867 100644 --- a/auditbeat/module/file_integrity/fields.go +++ b/auditbeat/module/file_integrity/fields.go @@ -20,7 +20,7 @@ package file_integrity import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/module/file_integrity/fileinfo_windows.go b/auditbeat/module/file_integrity/fileinfo_windows.go index 880620a7b32f..9a61ce19cdb9 100644 --- a/auditbeat/module/file_integrity/fileinfo_windows.go +++ b/auditbeat/module/file_integrity/fileinfo_windows.go @@ -29,7 +29,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) // NewMetadata returns a new Metadata object. If an error is returned it is diff --git a/auditbeat/module/file_integrity/flatbuffers.go b/auditbeat/module/file_integrity/flatbuffers.go index 2d6f823b1c7b..cd85894e6d1a 100644 --- a/auditbeat/module/file_integrity/flatbuffers.go +++ b/auditbeat/module/file_integrity/flatbuffers.go @@ -25,7 +25,7 @@ import ( flatbuffers "github.com/google/flatbuffers/go" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/module/file_integrity/schema" + "github.com/elastic/beats/v7/auditbeat/module/file_integrity/schema" ) // Requires the Google flatbuffer compiler. diff --git a/auditbeat/module/file_integrity/metricset.go b/auditbeat/module/file_integrity/metricset.go index 8e6792fd93d2..ad5958a3e8eb 100644 --- a/auditbeat/module/file_integrity/metricset.go +++ b/auditbeat/module/file_integrity/metricset.go @@ -26,10 +26,10 @@ import ( bolt "github.com/coreos/bbolt" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/auditbeat/module/file_integrity/metricset_test.go b/auditbeat/module/file_integrity/metricset_test.go index 195de0a515f7..43fa02d15f78 100644 --- a/auditbeat/module/file_integrity/metricset_test.go +++ b/auditbeat/module/file_integrity/metricset_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/auditbeat/datastore" - abtest "github.com/elastic/beats/auditbeat/testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/auditbeat/datastore" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/auditbeat/module/file_integrity/monitor/recursive.go b/auditbeat/module/file_integrity/monitor/recursive.go index b04658cfe8cc..8999ba5f8a0f 100644 --- a/auditbeat/module/file_integrity/monitor/recursive.go +++ b/auditbeat/module/file_integrity/monitor/recursive.go @@ -25,7 +25,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type recursiveWatcher struct { diff --git a/auditbeat/module/file_integrity/scanner.go b/auditbeat/module/file_integrity/scanner.go index 0438a6dad4f7..6a960065d1c3 100644 --- a/auditbeat/module/file_integrity/scanner.go +++ b/auditbeat/module/file_integrity/scanner.go @@ -26,7 +26,7 @@ import ( "golang.org/x/time/rate" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // scannerID is used as a global monotonically increasing counter for assigning diff --git a/auditbeat/scripts/mage/config.go b/auditbeat/scripts/mage/config.go index 72a67100dbd7..91f704461232 100644 --- a/auditbeat/scripts/mage/config.go +++ b/auditbeat/scripts/mage/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/auditbeat/scripts/mage/docs.go b/auditbeat/scripts/mage/docs.go index 0a2409e4323c..d28d1df62587 100644 --- a/auditbeat/scripts/mage/docs.go +++ b/auditbeat/scripts/mage/docs.go @@ -25,7 +25,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // ModuleDocs collects documentation from modules (both OSS and X-Pack). diff --git a/auditbeat/scripts/mage/package.go b/auditbeat/scripts/mage/package.go index 1ff16f64ddce..fbda2077f4f7 100644 --- a/auditbeat/scripts/mage/package.go +++ b/auditbeat/scripts/mage/package.go @@ -20,7 +20,7 @@ package mage import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // PackagingFlavor specifies the type of packaging (OSS vs X-Pack). diff --git a/auditbeat/testing/setup.go b/auditbeat/testing/setup.go index 00939eb0cbcf..1a8a8866b196 100644 --- a/auditbeat/testing/setup.go +++ b/auditbeat/testing/setup.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) // SetupDataDir sets up a temporary data directory to use for testing. diff --git a/dev-tools/cmd/asset/asset.go b/dev-tools/cmd/asset/asset.go index 3fa75501f193..1696e0781360 100644 --- a/dev-tools/cmd/asset/asset.go +++ b/dev-tools/cmd/asset/asset.go @@ -26,8 +26,8 @@ import ( "io/ioutil" "os" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/licenses" ) var ( diff --git a/dev-tools/cmd/dashboards/export_dashboards.go b/dev-tools/cmd/dashboards/export_dashboards.go index 7e48f19caaef..eeae6773a969 100644 --- a/dev-tools/cmd/dashboards/export_dashboards.go +++ b/dev-tools/cmd/dashboards/export_dashboards.go @@ -29,8 +29,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/dashboards" + "github.com/elastic/beats/v7/libbeat/kibana" ) var ( diff --git a/dev-tools/cmd/module_fields/module_fields.go b/dev-tools/cmd/module_fields/module_fields.go index 5c967ec9ecfd..203cc2980287 100644 --- a/dev-tools/cmd/module_fields/module_fields.go +++ b/dev-tools/cmd/module_fields/module_fields.go @@ -25,9 +25,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/generator/fields" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/licenses" ) var usageText = ` diff --git a/dev-tools/cmd/module_include_list/module_include_list.go b/dev-tools/cmd/module_include_list/module_include_list.go index d3e5d3c2b3e7..d4fb9bd9d256 100644 --- a/dev-tools/cmd/module_include_list/module_include_list.go +++ b/dev-tools/cmd/module_include_list/module_include_list.go @@ -32,8 +32,8 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/licenses" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/licenses" ) var usageText = ` diff --git a/dev-tools/generate_notice.py b/dev-tools/generate_notice.py index c38f8c4243a9..3b9fb278bb65 100755 --- a/dev-tools/generate_notice.py +++ b/dev-tools/generate_notice.py @@ -20,6 +20,71 @@ def read_file(filename): return f.read() +def read_go_mod(vendor_dir): + lines = [] + with open(os.path.join(vendor_dir, "modules.txt"), encoding="utf_8") as f: + lines = f.readlines() + + deps = [] + for line in lines: + if line.startswith("# "): + line = line[2:] + elems = line.split(" ") + if len(elems) == 2: + data = _get_version_info(elems) + deps.append(data) + continue + + if " => " in line: + data = _get_replaced_dep_data(line) + deps.append(data) + + return deps + + +def _get_version_info(elems): + data = {} + data["path"] = elems[0] + + version_info = elems[1].rstrip("\n") + if version_info.endswith("+incompatible"): + version_info = version_info[:-len("+incompatible")] + + if len(version_info) < 30: + data["version"] = version_info + return data + + revision_elems = version_info.split("-") + if len(revision_elems) != 3: + raise ValueError("unexpected number of elements") + + if revision_elems[0] != "v0.0.0": + data["version"] = revision_elems[0] + data["revision"] = revision_elems[2] + + return data + + +def _get_replaced_dep_data(line): + original, fork = line.split(" => ") + elems = fork.split(" ") + fork_data = _get_version_info(elems) + elems = original.split(" ") + data = _get_version_info(elems) + + if "path" in fork_data: + data["overwrite-path"] = fork_data["path"] + if "version" in fork_data: + data["overwrite-version"] = fork_data["version"] + if "revision" in fork_data: + data["overwrite-revision"] = fork_data["revision"] + + if "revision" in data and data["revision"] == "000000000000": + del(data["revision"]) + + return data + + def get_library_path(license): """ Get the contents up to the vendor folder. @@ -31,51 +96,41 @@ def get_library_path(license): return "/".join(split) -def read_versions(vendor): - libs = [] - with open(os.path.join(vendor, "vendor.json"), encoding='utf_8') as f: - govendor = json.load(f) - for package in govendor["package"]: - libs.append(package) - return libs +def gather_dependencies(vendor_dir, overrides=None): + dependencies = {} # lib_path -> [array of lib] + libs = read_go_mod(vendor_dir) + + # walk looking for LICENSE files + for root, dirs, filenames in os.walk("./vendor"): + licenses = get_licenses(root) + for filename in licenses: + lib_path = get_library_path(root) + lib_search = [l for l in libs if l["path"].startswith(lib_path)] + if len(lib_search) == 0: + print("WARNING: No version information found for: {}".format(lib_path)) + lib = {"path": lib_path} + else: + lib = copy.deepcopy(lib_search[0]) + lib["license_file"] = os.path.join(root, filename) -def gather_dependencies(vendor_dirs, overrides=None): - dependencies = {} # lib_path -> [array of lib] - for vendor in vendor_dirs: - libs = read_versions(vendor) - - # walk looking for LICENSE files - for root, dirs, filenames in os.walk(vendor): - licenses = get_licenses(root) - for filename in licenses: - lib_path = get_library_path(root) - lib_search = [l for l in libs if l["path"].startswith(lib_path)] - if len(lib_search) == 0: - print("WARNING: No version information found for: {}".format(lib_path)) - lib = {"path": lib_path} - else: - lib = copy.deepcopy(lib_search[0]) - - lib["license_file"] = os.path.join(root, filename) - - lib["license_contents"] = read_file(lib["license_file"]) - lib["license_summary"] = detect_license_summary(lib["license_contents"]) - if lib["license_summary"] == "UNKNOWN": - print("WARNING: Unknown license for: {}".format(lib_path)) - - revision = overrides.get(lib_path, {}).get("revision") - if revision: - lib["revision"] = revision - - if lib_path not in dependencies: - dependencies[lib_path] = [lib] - else: - dependencies[lib_path].append(lib) - - # don't walk down into another vendor dir - if "vendor" in dirs: - dirs.remove("vendor") + lib["license_contents"] = read_file(lib["license_file"]) + lib["license_summary"] = detect_license_summary(lib["license_contents"]) + if lib["license_summary"] == "UNKNOWN": + print("WARNING: Unknown license for: {}".format(lib_path)) + + revision = overrides.get(lib_path, {}).get("revision") + if revision: + lib["revision"] = revision + + if lib_path not in dependencies: + dependencies[lib_path] = [lib] + else: + dependencies[lib_path].append(lib) + + # don't walk down into another vendor dir + if "vendor" in dirs: + dirs.remove("vendor") return dependencies @@ -134,7 +189,7 @@ def has_license(folder): return True, "" -def check_all_have_license_files(vendor_dirs): +def check_all_have_license_files(vendor_dir): """ Checks that everything in the vendor folders has a license one way or the other. This doesn't collect the licenses, because the code that @@ -142,15 +197,19 @@ def check_all_have_license_files(vendor_dirs): that every folder in the `vendor` directories has at least one license. """ issues = [] - for vendor in vendor_dirs: - for root, dirs, filenames in os.walk(vendor): - if root.count(os.sep) - vendor.count(os.sep) == 2: # two levels deep - # Two level deep means folders like `github.com/elastic`. - # look for the license in root but also one level up - ok, issue = has_license(root) - if not ok: + for root, dirs, filenames in os.walk(vendor_dir): + depth = 2 + if root.count(os.sep) - vendor_dir.count(os.sep) == depth: # two levels deep + # Two level deep means folders like `github.com/elastic`. + # look for the license in root but also one level up + ok, issue = has_license(root) + if not ok: + depth += 1 + + if depth > 5: print("No license in: {}".format(issue)) issues.append(issue) + if len(issues) > 0: raise Exception("I have found licensing issues in the following folders: {}" .format(issues)) @@ -181,6 +240,12 @@ def write_notice_file(f, beat, copyright, dependencies): f.write("Version: {}\n".format(lib["version"])) if "revision" in lib: f.write("Revision: {}\n".format(lib["revision"])) + if "overwrite-path" in lib: + f.write("Overwrite: {}\n".format(lib["overwrite-path"])) + if "overwrite-version" in lib: + f.write("Overwrite-Version: {}\n".format(lib["overwrite-version"])) + if "overwrite-revision" in lib: + f.write("Overwrite-Revision: {}\n".format(lib["overwrite-revision"])) f.write("License type (autodetected): {}\n".format(lib["license_summary"])) f.write("{}:\n".format(lib["license_file"])) f.write("--------------------------------------------------------------------\n") @@ -215,8 +280,8 @@ def get_url(repo): return "https://github.com/{}/{}".format(words[1], words[2]) -def create_notice(filename, beat, copyright, vendor_dirs, csvfile, overrides=None): - dependencies = gather_dependencies(vendor_dirs, overrides=overrides) +def create_notice(filename, beat, copyright, vendor_dir, csvfile, overrides=None): + dependencies = gather_dependencies(vendor_dir, overrides=overrides) if not csvfile: with open(filename, "w+", encoding='utf_8') as f: write_notice_file(f, beat, copyright, dependencies) @@ -320,6 +385,10 @@ def create_notice(filename, beat, copyright, vendor_dirs, csvfile, overrides=Non "The Universal Permissive License (UPL), Version 1.0" ] +ISC_LICENSE_TITLE = [ + "ISC License", +] + # return SPDX identifiers from https://spdx.org/licenses/ def detect_license_summary(content): @@ -348,6 +417,10 @@ def detect_license_summary(content): return "UPL-1.0" if any(sentence in content[0:1500] for sentence in ECLIPSE_PUBLIC_LICENSE_TITLES): return "EPL-1.0" + if any(sentence in content[0:1500] for sentence in ISC_LICENSE_TITLE): + return "ISC" + if any(sentence in content[0:1500] for sentence in ECLIPSE_PUBLIC_LICENSE_TITLES): + return "EPL-1.0" return "UNKNOWN" @@ -360,6 +433,7 @@ def detect_license_summary(content): "MIT", "MPL-2.0", "UPL-1.0", + "ISC", ] SKIP_NOTICE = [] @@ -386,35 +460,21 @@ def detect_license_summary(content): cwd = os.getcwd() notice = os.path.join(cwd, "NOTICE.txt") - vendor_dirs = [] + vendor_dir = "./vendor" excludes = args.excludes if not isinstance(excludes, list): excludes = [excludes] SKIP_NOTICE = args.skip_notice - for root, dirs, files in os.walk(args.vendor): - - # Skips all hidden paths like ".git" - if '/.' in root: - continue - - if 'vendor' in dirs: - vendor_dirs.append(os.path.join(root, 'vendor')) - dirs.remove('vendor') # don't walk down into sub-vendors - - for exclude in excludes: - if exclude in dirs: - dirs.remove(exclude) - overrides = {} # revision overrides only for now if args.beats_origin: govendor = json.load(args.beats_origin) overrides = {package['path']: package for package in govendor["package"]} - print("Get the licenses available from {}".format(vendor_dirs)) - check_all_have_license_files(vendor_dirs) - dependencies = create_notice(notice, args.beat, args.copyright, vendor_dirs, args.csvfile, overrides=overrides) + print("Get the licenses available from {}".format(vendor_dir)) + check_all_have_license_files(vendor_dir) + dependencies = create_notice(notice, args.beat, args.copyright, vendor_dir, args.csvfile, overrides=overrides) # check that all licenses are accepted for _, deps in dependencies.items(): diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1 index 870932080555..9d43fef5c9b7 100755 --- a/dev-tools/jenkins_ci.ps1 +++ b/dev-tools/jenkins_ci.ps1 @@ -32,7 +32,7 @@ $env:TEST_COVERAGE = "true" $env:RACE_DETECTOR = "true" # Install mage from vendor. -exec { go install github.com/elastic/beats/vendor/github.com/magefile/mage } "mage install FAILURE" +exec { go install -mod=vendor github.com/magefile/mage } "mage install FAILURE" if (Test-Path "$env:beat\magefile.go") { cd "$env:beat" diff --git a/dev-tools/mage/build.go b/dev-tools/mage/build.go index 13e6fcfaa354..74fe4f1214db 100644 --- a/dev-tools/mage/build.go +++ b/dev-tools/mage/build.go @@ -56,26 +56,9 @@ func DefaultBuildArgs() BuildArgs { "github.com/elastic/beats/libbeat/version.commit": "{{ commit }}", }, } - if versionQualified { args.Vars["github.com/elastic/beats/libbeat/version.qualifier"] = "{{ .Qualifier }}" } - - repo, err := GetProjectRepoInfo() - if err != nil { - panic(errors.Wrap(err, "failed to determine project repo info")) - } - - if !repo.IsElasticBeats() { - // Assume libbeat is vendored and prefix the variables. - prefix := repo.RootImportPath + "/vendor/" - prefixedVars := map[string]string{} - for k, v := range args.Vars { - prefixedVars[prefix+k] = v - } - args.Vars = prefixedVars - } - return args } @@ -132,6 +115,16 @@ func Build(params BuildArgs) error { } env["CGO_ENABLED"] = cgoEnabled + if UseVendor { + var goFlags string + goFlags, ok := env["GOFLAGS"] + if !ok { + env["GOFLAGS"] = "-mod=vendor" + } else { + env["GOFLAGS"] = strings.Join([]string{goFlags, "-mod=vendor"}, " ") + } + } + // Spec args := []string{ "build", diff --git a/dev-tools/mage/check.go b/dev-tools/mage/check.go index 6c30bd1dafc1..11767ae7d3c9 100644 --- a/dev-tools/mage/check.go +++ b/dev-tools/mage/check.go @@ -35,8 +35,8 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/dev-tools/mage/gotool" - "github.com/elastic/beats/libbeat/processors/dissect" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/libbeat/processors/dissect" ) // Check looks for created/modified/deleted/renamed files and returns an error diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index 17158ad4b4c6..b4ca802be1bf 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -31,7 +31,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) const defaultCrossBuildTarget = "golangCrossBuild" @@ -215,7 +215,7 @@ func (b GolangCrossBuilder) Build() error { return errors.Wrap(err, "failed to determine repo root and package sub dir") } - mountPoint := filepath.ToSlash(filepath.Join("/go", "src", repoInfo.RootImportPath)) + mountPoint := filepath.ToSlash(filepath.Join("/go", "src", repoInfo.CanonicalRootImportPath)) // use custom dir for build if given, subdir if not: cwd := repoInfo.SubDir if b.InDir != "" { @@ -247,6 +247,10 @@ func (b GolangCrossBuilder) Build() error { if versionQualified { args = append(args, "--env", "VERSION_QUALIFIER="+versionQualifier) } + if UseVendor { + args = append(args, "--env", "GOFLAGS=-mod=vendor") + } + args = append(args, "--rm", "--env", "MAGEFILE_VERBOSE="+verbose, diff --git a/dev-tools/mage/dashboard.go b/dev-tools/mage/dashboard.go index 764a9e286952..562a3bf8f799 100644 --- a/dev-tools/mage/dashboard.go +++ b/dev-tools/mage/dashboard.go @@ -44,7 +44,7 @@ func ExportDashboard() error { return err } - dashboardCmd := sh.RunCmd("go", "run", filepath.Join(beatsDir, "dev-tools/cmd/dashboards/export_dashboards.go")) + dashboardCmd := sh.RunCmd("go", "run", "-mod", "vendor", filepath.Join(beatsDir, "dev-tools/cmd/dashboards/export_dashboards.go")) // TODO: This is currently hardcoded for KB 7, we need to figure out what we do for KB 8 if applicable file := CWD("module", module, "_meta/kibana/7/dashboard", id+".json") diff --git a/dev-tools/mage/fields.go b/dev-tools/mage/fields.go index 009d720840cb..cb2b6ef76856 100644 --- a/dev-tools/mage/fields.go +++ b/dev-tools/mage/fields.go @@ -101,12 +101,17 @@ func generateFieldsYAML(baseDir, output string, moduleDirs ...string) error { return err } - globalFieldsCmd := sh.RunCmd("go", "run", + cmd := []string{"run"} + if UseVendor { + cmd = append(cmd, "-mod", "vendor") + } + cmd = append(cmd, filepath.Join(beatsDir, globalFieldsCmdPath), "-es_beats_path", beatsDir, "-beat_path", baseDir, "-out", CreateDir(output), ) + globalFieldsCmd := sh.RunCmd("go", cmd...) return globalFieldsCmd(moduleDirs...) } @@ -125,7 +130,11 @@ func GenerateFieldsGo(fieldsYML, out string) error { return err } - assetCmd := sh.RunCmd("go", "run", + cmd := []string{"run"} + if UseVendor { + cmd = append(cmd, "-mod", "vendor") + } + cmd = append(cmd, filepath.Join(beatsDir, assetCmdPath), "-pkg", "include", "-in", fieldsYML, @@ -133,6 +142,7 @@ func GenerateFieldsGo(fieldsYML, out string) error { "-license", toLibbeatLicenseName(BeatLicense), BeatName, ) + assetCmd := sh.RunCmd("go", cmd...) return assetCmd() } @@ -152,12 +162,17 @@ func GenerateModuleFieldsGo(moduleDir string) error { moduleDir = CWD(moduleDir) } - moduleFieldsCmd := sh.RunCmd("go", "run", + cmd := []string{"run"} + if UseVendor { + cmd = append(cmd, "-mod", "vendor") + } + cmd = append(cmd, filepath.Join(beatsDir, moduleFieldsCmdPath), "-beat", BeatName, "-license", toLibbeatLicenseName(BeatLicense), moduleDir, ) + moduleFieldsCmd := sh.RunCmd("go", cmd...) return moduleFieldsCmd() } @@ -179,13 +194,19 @@ func GenerateIncludeListGo(options IncludeListOptions) error { return err } - includeListCmd := sh.RunCmd("go", "run", + cmd := []string{"run"} + if UseVendor { + cmd = append(cmd, "-mod", "vendor") + } + cmd = append(cmd, filepath.Join(beatsDir, moduleIncludeListCmdPath), "-license", toLibbeatLicenseName(BeatLicense), "-out", options.Outfile, "-buildTags", options.BuildTags, "-pkg", options.Pkg, ) + includeListCmd := sh.RunCmd("go", cmd...) + var args []string for _, dir := range options.ImportDirs { if !filepath.IsAbs(dir) { diff --git a/dev-tools/mage/fmt.go b/dev-tools/mage/fmt.go index 8851f67676ad..f86ed59a692d 100644 --- a/dev-tools/mage/fmt.go +++ b/dev-tools/mage/fmt.go @@ -27,12 +27,12 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( // GoImportsImportPath controls the import path used to install goimports. - GoImportsImportPath = "github.com/elastic/beats/vendor/golang.org/x/tools/cmd/goimports" + GoImportsImportPath = "golang.org/x/tools/cmd/goimports" // GoImportsLocalPrefix is a string prefix matching imports that should be // grouped after third-party packages. @@ -64,8 +64,19 @@ func GoImports() error { } fmt.Println(">> fmt - goimports: Formatting Go code") - if err := sh.Run("go", "get", GoImportsImportPath); err != nil { - return err + if UseVendor { + if err := gotool.Install( + gotool.Install.Vendored(), + gotool.Install.Package(filepath.Join(GoImportsImportPath)), + ); err != nil { + return err + } + } else { + if err := gotool.Get( + gotool.Get.Package(filepath.Join(GoImportsImportPath)), + ); err != nil { + return err + } } args := append( diff --git a/dev-tools/mage/godaemon.go b/dev-tools/mage/godaemon.go index ee6b38a360ef..7511cae8044c 100644 --- a/dev-tools/mage/godaemon.go +++ b/dev-tools/mage/godaemon.go @@ -43,7 +43,7 @@ func BuildGoDaemon() error { // Test if binaries are up-to-date. output := MustExpand("build/golang-crossbuild/god-{{.Platform.GOOS}}-{{.Platform.Arch}}") - input := MustExpand("{{ elastic_beats_dir }}/vendor/github.com/tsg/go-daemon/god.c") + input := MustExpand("{{ elastic_beats_dir }}/vendor/github.com/tsg/go-daemon/src/god.c") if IsUpToDate(output, input) { log.Println(">>> buildGoDaemon is up-to-date for", Platform.Name) return nil diff --git a/dev-tools/mage/gomod.go b/dev-tools/mage/gomod.go new file mode 100644 index 000000000000..17f4e8917f6a --- /dev/null +++ b/dev-tools/mage/gomod.go @@ -0,0 +1,96 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package mage + +import ( + "fmt" + "os" + "path/filepath" + + "github.com/elastic/beats/v7/dev-tools/mage/gotool" +) + +// copyModule contains a module name and the list of files or directories +// to copy recursively. +type copyModule struct { + name string + filesToCopy []string +} + +var ( + copyAll = []copyModule{ + copyModule{ + name: "github.com/godror/godror", + filesToCopy: []string{ + "odpi", + }, + }, + copyModule{ + name: "github.com/tsg/go-daemon", + filesToCopy: []string{ + "src", + }, + }, + } +) + +// Vendor cleans up go.mod and copies the files not carried over from modules cache. +func Vendor() error { + mod := gotool.Mod + + err := mod.Tidy() + if err != nil { + return err + } + + err = mod.Vendor() + if err != nil { + return err + } + + err = mod.Verify() + if err != nil { + return err + } + + repo, err := GetProjectRepoInfo() + if err != nil { + return err + } + vendorFolder := filepath.Join(repo.RootDir, "vendor") + + // copy packages which require the whole tree + for _, p := range copyAll { + path, err := gotool.ListModulePath(p.name) + if err != nil { + return err + } + fmt.Println(path) + + for _, f := range p.filesToCopy { + from := filepath.Join(path, f) + to := filepath.Join(vendorFolder, p.name, f) + copyTask := &CopyTask{Source: from, Dest: to, DirMode: os.ModeDir | 0750} + err = copyTask.Execute() + if err != nil { + return err + } + } + } + return nil +} diff --git a/dev-tools/mage/gotool/go.go b/dev-tools/mage/gotool/go.go index 64ea94a9ad78..30eaa6ff87d6 100644 --- a/dev-tools/mage/gotool/go.go +++ b/dev-tools/mage/gotool/go.go @@ -18,6 +18,7 @@ package gotool import ( + "fmt" "os" "strings" @@ -37,11 +38,36 @@ type Args struct { // ArgOpt is a functional option adding info to Args once executed. type ArgOpt func(args *Args) +type goInstall func(opts ...ArgOpt) error + +// Install runs `go install` and provides optionals for adding command line arguments. +var Install goInstall = runGoInstall + +func runGoInstall(opts ...ArgOpt) error { + args := buildArgs(opts) + return runVGo("install", args) +} + +func (goInstall) Package(pkg string) ArgOpt { return posArg(pkg) } +func (goInstall) Vendored() ArgOpt { return flagArg("-mod", "vendor") } + type goTest func(opts ...ArgOpt) error // Test runs `go test` and provides optionals for adding command line arguments. var Test goTest = runGoTest +// GetModuleName returns the name of the module. +func GetModuleName() (string, error) { + lines, err := getLines(callGo(nil, "list", "-m")) + if err != nil { + return "", err + } + if len(lines) != 1 { + return "", fmt.Errorf("unexpected number of lines") + } + return lines[0], nil +} + // ListProjectPackages lists all packages in the current project func ListProjectPackages() ([]string, error) { return ListPackages("./...") @@ -67,6 +93,23 @@ func ListTestFiles(pkg string) ([]string, error) { return getLines(callGo(nil, "list", "-f", tmpl, pkg)) } +// ListModulePath returns the path to the module in the cache. +func ListModulePath(pkg string) (string, error) { + const tmpl = `{{.Dir}}` + env := map[string]string{ + // make sure to look in the module cache + "GOFLAGS": "", + } + lines, err := getLines(callGo(env, "list", "-m", "-f", tmpl, pkg)) + if err != nil { + return "", err + } + if n := len(lines); n != 1 { + return "", fmt.Errorf("expected 1 line, got %d", n) + } + return lines[0], nil +} + // HasTests returns true if the given package contains test files. func HasTests(pkg string) (bool, error) { files, err := ListTestFiles(pkg) diff --git a/dev-tools/mage/gotool/modules.go b/dev-tools/mage/gotool/modules.go new file mode 100644 index 000000000000..239425ee3217 --- /dev/null +++ b/dev-tools/mage/gotool/modules.go @@ -0,0 +1,54 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package gotool + +// Mod is the command go mod. +var Mod = goMod{ + Tidy: modCommand{"tidy"}.run, + Verify: modCommand{"verify"}.run, + Vendor: modCommand{"vendor"}.run, +} + +type modCommand struct { + method string +} + +func (cmd modCommand) run(opts ...ArgOpt) error { + o := make([]ArgOpt, len(opts)+1) + o[0] = posArg(cmd.method) + for i, opt := range opts { + o[i+1] = opt + } + args := buildArgs(o) + return runVGo("mod", args) +} + +type goMod struct { + Tidy modTidy + Verify modVerify + Vendor modVendor +} + +// modTidy cleans the go.mod file +type modTidy func(opts ...ArgOpt) error + +// modVerify check that deps have the expected content. +type modVerify func(opts ...ArgOpt) error + +// modVendor downloads and copies dependencies under the folder vendor. +type modVendor func(opts ...ArgOpt) error diff --git a/dev-tools/mage/install.go b/dev-tools/mage/install.go index 9b2c7795c631..67483d23bb9f 100644 --- a/dev-tools/mage/install.go +++ b/dev-tools/mage/install.go @@ -18,11 +18,7 @@ package mage import ( - "path/filepath" - - "github.com/pkg/errors" - - "github.com/elastic/beats/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( @@ -32,18 +28,19 @@ var ( // InstallVendored uses go get to install a command from its vendored source func InstallVendored(importPath string) error { - beatDir, err := ElasticBeatsDir() - if err != nil { - return errors.Wrap(err, "failed to obtain beats repository path") - } - - get := gotool.Get - return get( - get.Package(filepath.Join(beatDir, "vendor", importPath)), + install := gotool.Install + return install( + install.Vendored(), + install.Package(importPath), ) } // InstallGoLicenser target installs go-licenser func InstallGoLicenser() error { - return InstallVendored(GoLicenserImportPath) + if UseVendor { + return InstallVendored(GoLicenserImportPath) + } + return gotool.Get( + gotool.Get.Package(GoLicenserImportPath), + ) } diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go index 0c8d32e19f4b..41219d58d6cf 100644 --- a/dev-tools/mage/integtest.go +++ b/dev-tools/mage/integtest.go @@ -182,7 +182,7 @@ func runInIntegTestEnv(mageTarget string, test func() error, passThroughEnvVars if err != nil { return err } - magePath := filepath.Join("/go/src", repo.ImportPath, "build/mage-linux-amd64") + magePath := filepath.Join("/go/src", repo.CanonicalRootImportPath, repo.SubDir, "build/mage-linux-amd64") // Build docker-compose args. args := []string{"-p", dockerComposeProjectName(), "run", @@ -194,6 +194,9 @@ func runInIntegTestEnv(mageTarget string, test func() error, passThroughEnvVars "-e", "STACK_ENVIRONMENT=" + StackEnvironment, "-e", "TESTING_ENVIRONMENT=" + StackEnvironment, } + if UseVendor { + args = append(args, "-e", "GOFLAGS=-mod=vendor") + } args, err = addUidGidEnvArgs(args) if err != nil { return err diff --git a/dev-tools/mage/pkg_test.go b/dev-tools/mage/pkg_test.go index f9bd3a708eda..e360686b54a3 100644 --- a/dev-tools/mage/pkg_test.go +++ b/dev-tools/mage/pkg_test.go @@ -88,7 +88,7 @@ func TestRepoRoot(t *testing.T) { t.Error(err) } - assert.Equal(t, "github.com/elastic/beats", repo.RootImportPath) + assert.Equal(t, "github.com/elastic/beats/v7", repo.RootImportPath) assert.True(t, filepath.IsAbs(repo.RootDir)) cwd := filepath.Join(repo.RootDir, repo.SubDir) assert.Equal(t, CWD(), cwd) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index dfe674326071..cc1a42f86ef4 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -23,7 +23,9 @@ import ( "io/ioutil" "log" "os" + "path" "path/filepath" + "reflect" "regexp" "strconv" "strings" @@ -33,6 +35,8 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" "golang.org/x/tools/go/vcs" + + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) const ( @@ -56,6 +60,7 @@ var ( XPackDir = "../x-pack" RaceDetector = false TestCoverage = false + UseVendor = true BeatName = EnvOr("BEAT_NAME", filepath.Base(CWD())) BeatServiceName = EnvOr("BEAT_SERVICE_NAME", BeatName) @@ -101,6 +106,10 @@ func init() { if err != nil { panic(errors.Wrap(err, "failed to parse TEST_COVERAGE env value")) } + UseVendor, err = strconv.ParseBool(EnvOr("USE_VENDOR", "true")) + if err != nil { + panic(errors.Wrap(err, "failed to parse USE_VENDOR env value")) + } Snapshot, err = strconv.ParseBool(EnvOr("SNAPSHOT", "false")) if err != nil { @@ -189,16 +198,17 @@ VersionQualifier = {{.Qualifier}} ## Functions -beat_doc_branch = {{ beat_doc_branch }} -beat_version = {{ beat_version }} -commit = {{ commit }} -date = {{ date }} -elastic_beats_dir = {{ elastic_beats_dir }} -go_version = {{ go_version }} -repo.RootImportPath = {{ repo.RootImportPath }} -repo.RootDir = {{ repo.RootDir }} -repo.ImportPath = {{ repo.ImportPath }} -repo.SubDir = {{ repo.SubDir }} +beat_doc_branch = {{ beat_doc_branch }} +beat_version = {{ beat_version }} +commit = {{ commit }} +date = {{ date }} +elastic_beats_dir = {{ elastic_beats_dir }} +go_version = {{ go_version }} +repo.RootImportPath = {{ repo.RootImportPath }} +repo.CanonicalRootImportPath = {{ repo.CanonicalRootImportPath }} +repo.RootDir = {{ repo.RootDir }} +repo.ImportPath = {{ repo.ImportPath }} +repo.SubDir = {{ repo.SubDir }} ` return Expand(dumpTemplate) @@ -259,39 +269,26 @@ func ElasticBeatsDir() (string, error) { return elasticBeatsDirValue, elasticBeatsDirErr } -// findElasticBeatsDir attempts to find the root of the Elastic Beats directory. -// It checks to see if the current project is elastic/beats, and then if not -// checks the vendor directory. +// findElasticBeatsDir returns the root directory of the Elastic Beats module, using "go list". // -// If your project places the Beats files in a different location (specifically -// the dev-tools/ contents) then you can use SetElasticBeatsDir(). +// When running within the Elastic Beats repo, this will return the repo root. Otherwise, +// it will return the root directory of the module from within the module cache or vendor +// directory. func findElasticBeatsDir() (string, error) { - repo, err := GetProjectRepoInfo() - if err != nil { - return "", err - } - - if repo.IsElasticBeats() { - return repo.RootDir, nil - } - - const devToolsImportPath = elasticBeatsImportPath + "/dev-tools/mage" - - // Search in project vendor directories. Order is relevant - searchPaths := []string{ - // beats directory of apm-server - filepath.Join(repo.RootDir, "_beats/dev-tools/vendor"), - filepath.Join(repo.RootDir, repo.SubDir, "vendor", devToolsImportPath), - filepath.Join(repo.RootDir, "vendor", devToolsImportPath), - } - - for _, path := range searchPaths { - if _, err := os.Stat(path); err == nil { - return filepath.Join(path, "../.."), nil + // Find the import path for the package containing this file. + type foo struct{} + typ := reflect.TypeOf(foo{}) + magepkgpath := typ.PkgPath() + + // Walk up the import path until we find the elastic/beats module path. + pkgpath := magepkgpath + for extractCanonicalRootImportPath(pkgpath) != elasticBeatsImportPath { + pkgpath = path.Dir(pkgpath) + if pkgpath == "." { + return "", errors.Errorf("failed to find %q from %q", elasticBeatsImportPath, magepkgpath) } } - - return "", errors.Errorf("failed to find %v in the project's vendor", devToolsImportPath) + return gotool.ListModulePath(pkgpath) } var ( @@ -539,16 +536,17 @@ func parseDocBranch(data []byte) (string, error) { // ProjectRepoInfo contains information about the project's repo. type ProjectRepoInfo struct { - RootImportPath string // Import path at the project root. - RootDir string // Root directory of the project. - ImportPath string // Import path of the current directory. - SubDir string // Relative path from the root dir to the current dir. + RootImportPath string // Import path at the project root. + CanonicalRootImportPath string // Pre-modules root import path (does not contain semantic import version identifier). + RootDir string // Root directory of the project. + ImportPath string // Import path of the current directory. + SubDir string // Relative path from the root dir to the current dir. } // IsElasticBeats returns true if the current project is // github.com/elastic/beats. func (r *ProjectRepoInfo) IsElasticBeats() bool { - return r.RootImportPath == elasticBeatsImportPath + return r.CanonicalRootImportPath == elasticBeatsImportPath } var ( @@ -561,61 +559,177 @@ var ( // import path and the current directory's import path. func GetProjectRepoInfo() (*ProjectRepoInfo, error) { repoInfoOnce.Do(func() { - repoInfoValue, repoInfoErr = getProjectRepoInfo() + if isUnderGOPATH() { + repoInfoValue, repoInfoErr = getProjectRepoInfoUnderGopath() + } else { + repoInfoValue, repoInfoErr = getProjectRepoInfoWithModules() + } }) return repoInfoValue, repoInfoErr } -func getProjectRepoInfo() (*ProjectRepoInfo, error) { +func isUnderGOPATH() bool { + underGOPATH := false + srcDirs, err := listSrcGOPATHs() + if err != nil { + return false + } + for _, srcDir := range srcDirs { + rel, err := filepath.Rel(srcDir, CWD()) + if err != nil { + continue + } + + if !strings.Contains(rel, "..") { + underGOPATH = true + } + } + + return underGOPATH +} + +func getProjectRepoInfoWithModules() (*ProjectRepoInfo, error) { var ( - cwd = CWD() - rootImportPath string - srcDir string + cwd = CWD() + rootDir string + subDir string ) - // Search upward from the CWD to determine the project root based on VCS. + possibleRoot := cwd var errs []string - for _, gopath := range filepath.SplitList(build.Default.GOPATH) { - gopath = filepath.Clean(gopath) + for { + isRoot, err := isGoModRoot(possibleRoot) + if err != nil { + errs = append(errs, err.Error()) + } - if !strings.HasPrefix(cwd, gopath) { - // Fixes an issue on macOS when /var is actually /private/var. - var err error - gopath, err = filepath.EvalSymlinks(gopath) - if err != nil { - errs = append(errs, err.Error()) - continue - } + if isRoot { + rootDir = possibleRoot + break } - srcDir = filepath.Join(gopath, "src") + subDir, err = filepath.Rel(possibleRoot, cwd) + if err != nil { + errs = append(errs, err.Error()) + } + possibleRoot = filepath.Dir(possibleRoot) + } + + if rootDir == "" { + return nil, errors.Errorf("failed to find root dir of module file: %v", errs) + } + + rootImportPath, err := gotool.GetModuleName() + if err != nil { + return nil, err + } + + return &ProjectRepoInfo{ + RootImportPath: rootImportPath, + CanonicalRootImportPath: filepath.ToSlash(extractCanonicalRootImportPath(rootImportPath)), + RootDir: rootDir, + SubDir: subDir, + ImportPath: filepath.ToSlash(filepath.Join(rootImportPath, subDir)), + }, nil +} + +func isGoModRoot(path string) (bool, error) { + gomodPath := filepath.Join(path, "go.mod") + _, err := os.Stat(gomodPath) + if os.IsNotExist(err) { + return false, nil + } + if err != nil { + return false, err + } + + return true, nil +} + +func getProjectRepoInfoUnderGopath() (*ProjectRepoInfo, error) { + var ( + cwd = CWD() + errs []string + rootDir string + ) + + srcDirs, err := listSrcGOPATHs() + if err != nil { + return nil, err + } + + for _, srcDir := range srcDirs { _, root, err := vcs.FromDir(cwd, srcDir) if err != nil { // Try the next gopath. errs = append(errs, err.Error()) continue } - rootImportPath = root + rootDir = filepath.Join(srcDir, root) break } - if rootImportPath == "" { - return nil, errors.Errorf("failed to determine root import path (Did "+ - "you git init?, Is the project in the GOPATH? GOPATH=%v, CWD=%v?): %v", - build.Default.GOPATH, cwd, errs) + + if rootDir == "" { + return nil, errors.Errorf("error while determining root directory: %v", errs) } - rootDir := filepath.Join(srcDir, rootImportPath) subDir, err := filepath.Rel(rootDir, cwd) if err != nil { return nil, errors.Wrap(err, "failed to get relative path to repo root") } - importPath := filepath.ToSlash(filepath.Join(rootImportPath, subDir)) + + rootImportPath, err := gotool.GetModuleName() + if err != nil { + return nil, err + } return &ProjectRepoInfo{ - RootImportPath: rootImportPath, - RootDir: rootDir, - SubDir: subDir, - ImportPath: importPath, + RootImportPath: rootImportPath, + CanonicalRootImportPath: filepath.ToSlash(extractCanonicalRootImportPath(rootImportPath)), + RootDir: rootDir, + SubDir: subDir, + ImportPath: filepath.ToSlash(filepath.Join(rootImportPath, subDir)), }, nil } + +func extractCanonicalRootImportPath(rootImportPath string) string { + // In order to be compatible with go modules, the root import + // path of any module at major version v2 or higher must include + // the major version. + // Ref: https://github.com/golang/go/wiki/Modules#semantic-import-versioning + // + // Thus, Beats has to include the major version as well. + // This regex removes the major version from the import path. + re := regexp.MustCompile(`(/v[1-9][0-9]*)$`) + return re.ReplaceAllString(rootImportPath, "") +} + +func listSrcGOPATHs() ([]string, error) { + var ( + cwd = CWD() + errs []string + srcDirs []string + ) + for _, gopath := range filepath.SplitList(build.Default.GOPATH) { + gopath = filepath.Clean(gopath) + + if !strings.HasPrefix(cwd, gopath) { + // Fixes an issue on macOS when /var is actually /private/var. + var err error + gopath, err = filepath.EvalSymlinks(gopath) + if err != nil { + errs = append(errs, err.Error()) + continue + } + } + + srcDirs = append(srcDirs, filepath.Join(gopath, "src")) + } + + if len(srcDirs) == 0 { + return srcDirs, errors.Errorf("failed to find any GOPATH %v", errs) + } + + return srcDirs, nil +} diff --git a/dev-tools/mage/target/build/build.go b/dev-tools/mage/target/build/build.go index edb56e86ded5..4e668fc78691 100644 --- a/dev-tools/mage/target/build/build.go +++ b/dev-tools/mage/target/build/build.go @@ -18,7 +18,7 @@ package build import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // Build builds the Beat binary. diff --git a/dev-tools/mage/target/collectors/collect.go b/dev-tools/mage/target/collectors/collect.go index eb24360f6767..cd1614b19850 100644 --- a/dev-tools/mage/target/collectors/collect.go +++ b/dev-tools/mage/target/collectors/collect.go @@ -18,7 +18,7 @@ package collectors import ( - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" ) //CollectDocs creates the documentation under docs/ diff --git a/dev-tools/mage/target/common/check.go b/dev-tools/mage/target/common/check.go index d5038c99c947..90e4e56a256c 100644 --- a/dev-tools/mage/target/common/check.go +++ b/dev-tools/mage/target/common/check.go @@ -20,7 +20,7 @@ package common import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var checkDeps []interface{} diff --git a/dev-tools/mage/target/common/clean.go b/dev-tools/mage/target/common/clean.go index ddda44fee328..fcda6e25fe51 100644 --- a/dev-tools/mage/target/common/clean.go +++ b/dev-tools/mage/target/common/clean.go @@ -17,7 +17,7 @@ package common -import devtools "github.com/elastic/beats/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/dev-tools/mage" // Clean cleans all generated files and build artifacts. func Clean() error { diff --git a/dev-tools/mage/target/common/fmt.go b/dev-tools/mage/target/common/fmt.go index 9405d69ca487..b29dac7ae906 100644 --- a/dev-tools/mage/target/common/fmt.go +++ b/dev-tools/mage/target/common/fmt.go @@ -20,7 +20,7 @@ package common import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // Fmt formats source code (.go and .py) and adds license headers. diff --git a/dev-tools/mage/target/common/shared.go b/dev-tools/mage/target/common/shared.go index 68f2620b3f3a..a062bf50084e 100644 --- a/dev-tools/mage/target/common/shared.go +++ b/dev-tools/mage/target/common/shared.go @@ -17,7 +17,7 @@ package common -import devtools "github.com/elastic/beats/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/dev-tools/mage" // DumpVariables writes the template variables and values to stdout. func DumpVariables() error { diff --git a/dev-tools/mage/target/compose/compose.go b/dev-tools/mage/target/compose/compose.go index c6ee75b8bcdc..8af1666d7526 100644 --- a/dev-tools/mage/target/compose/compose.go +++ b/dev-tools/mage/target/compose/compose.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // SupportedVersions is the definition of supported version files diff --git a/dev-tools/mage/target/dashboards/dashboards.go b/dev-tools/mage/target/dashboards/dashboards.go index 372a61e52d25..c993b8bacc0a 100644 --- a/dev-tools/mage/target/dashboards/dashboards.go +++ b/dev-tools/mage/target/dashboards/dashboards.go @@ -21,7 +21,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/docs/docs.go b/dev-tools/mage/target/docs/docs.go index 7558b6280359..fa972056b5ae 100644 --- a/dev-tools/mage/target/docs/docs.go +++ b/dev-tools/mage/target/docs/docs.go @@ -20,7 +20,7 @@ package docs import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/integtest/integtest.go b/dev-tools/mage/target/integtest/integtest.go index 33c924bbe180..142a713effc8 100644 --- a/dev-tools/mage/target/integtest/integtest.go +++ b/dev-tools/mage/target/integtest/integtest.go @@ -22,8 +22,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/mage/target/pkg/test.go b/dev-tools/mage/target/pkg/test.go index 806d46789a34..7d4f0ef92213 100644 --- a/dev-tools/mage/target/pkg/test.go +++ b/dev-tools/mage/target/pkg/test.go @@ -17,7 +17,7 @@ package pkg -import devtools "github.com/elastic/beats/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/dev-tools/mage" // PackageTest tests the generated packages in build/distributions. It checks // things like file ownership/mode, package attributes, etc. diff --git a/dev-tools/mage/target/unittest/unittest.go b/dev-tools/mage/target/unittest/unittest.go index 1805e9a62882..859849bac1ed 100644 --- a/dev-tools/mage/target/unittest/unittest.go +++ b/dev-tools/mage/target/unittest/unittest.go @@ -22,8 +22,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/magefile.go b/dev-tools/magefile.go index 233ccfde5a9f..083e7e3479c1 100644 --- a/dev-tools/magefile.go +++ b/dev-tools/magefile.go @@ -21,5 +21,5 @@ package main import ( // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" ) diff --git a/dev-tools/make/mage.mk b/dev-tools/make/mage.mk index 48fd7d56d48f..76f507e3d67e 100644 --- a/dev-tools/make/mage.mk +++ b/dev-tools/make/mage.mk @@ -1,13 +1,13 @@ MAGE_VERSION ?= v1.9.0 MAGE_PRESENT := $(shell mage --version 2> /dev/null | grep $(MAGE_VERSION)) -MAGE_IMPORT_PATH ?= github.com/elastic/beats/vendor/github.com/magefile/mage +MAGE_IMPORT_PATH ?= github.com/magefile/mage export MAGE_IMPORT_PATH .PHONY: mage mage: ifndef MAGE_PRESENT @echo Installing mage $(MAGE_VERSION) from vendor dir. - @go install -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH} + @go install -mod=vendor -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH} @-mage -clean endif @true diff --git a/dev-tools/packaging/preference-pane/magefile.go b/dev-tools/packaging/preference-pane/magefile.go index 16ccb18184f5..77eb9c437dae 100644 --- a/dev-tools/packaging/preference-pane/magefile.go +++ b/dev-tools/packaging/preference-pane/magefile.go @@ -28,7 +28,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var builder = preferencePaneBuilder{ diff --git a/dev-tools/packaging/templates/common/magefile.go.tmpl b/dev-tools/packaging/templates/common/magefile.go.tmpl index c09fc4eb1e27..286f9d30555a 100644 --- a/dev-tools/packaging/templates/common/magefile.go.tmpl +++ b/dev-tools/packaging/templates/common/magefile.go.tmpl @@ -10,7 +10,7 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) func init() { diff --git a/docs/devguide/contributing.asciidoc b/docs/devguide/contributing.asciidoc index fcf6781cc3bd..5f0166beb747 100644 --- a/docs/devguide/contributing.asciidoc +++ b/docs/devguide/contributing.asciidoc @@ -55,10 +55,6 @@ After https://golang.org/doc/install[installing Go], set the https://golang.org/doc/code.html#GOPATH[GOPATH] environment variable to point to your workspace location, and make sure `$GOPATH/bin` is in your PATH. -The location where you clone is important. Make a directory structure under -`GOPATH` that matches the URL used for Elastic repositories, then clone the -beats repository under the new directory: - [source,shell] ---------------------------------------------------------------------- mkdir -p ${GOPATH}/src/github.com/elastic @@ -179,11 +175,15 @@ your browser with the docs for preview. [[dependencies]] === Dependencies -To manage the `vendor/` folder we use -https://github.com/kardianos/govendor[govendor]. Please see -the govendor documentation on how to add or update vendored dependencies. +In order to create Beats we rely on Golang libraries and other +external tools. + +[float] +==== Golang + +To manage the `vendor/` folder we use go modules. -In most cases `govendor fetch your/dependency@version +out` will get the job done. +To update the contents of `vendor/`, run `mage vendor`. [float] [[changelog]] diff --git a/filebeat/autodiscover/autodiscover.go b/filebeat/autodiscover/autodiscover.go index faa0475163fd..85fa6cf65bd2 100644 --- a/filebeat/autodiscover/autodiscover.go +++ b/filebeat/autodiscover/autodiscover.go @@ -20,10 +20,10 @@ package autodiscover import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // AutodiscoverAdapter for Filebeat modules & input diff --git a/filebeat/autodiscover/builder/hints/config.go b/filebeat/autodiscover/builder/hints/config.go index 25994c211c83..55b1ffb18115 100644 --- a/filebeat/autodiscover/builder/hints/config.go +++ b/filebeat/autodiscover/builder/hints/config.go @@ -17,7 +17,7 @@ package hints -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type config struct { Key string `config:"key"` diff --git a/filebeat/autodiscover/builder/hints/logs.go b/filebeat/autodiscover/builder/hints/logs.go index 571c30fd33b1..f467f7c2ef60 100644 --- a/filebeat/autodiscover/builder/hints/logs.go +++ b/filebeat/autodiscover/builder/hints/logs.go @@ -21,14 +21,14 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/fileset" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/autodiscover/builder/hints/logs_test.go b/filebeat/autodiscover/builder/hints/logs_test.go index 4303d41363e3..b316cdb506c2 100644 --- a/filebeat/autodiscover/builder/hints/logs_test.go +++ b/filebeat/autodiscover/builder/hints/logs_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/paths" ) func TestGenerateHints(t *testing.T) { diff --git a/filebeat/autodiscover/include.go b/filebeat/autodiscover/include.go index 1cebd28bc1a5..de15185e7166 100644 --- a/filebeat/autodiscover/include.go +++ b/filebeat/autodiscover/include.go @@ -19,5 +19,5 @@ package autodiscover import ( // include all filebeat specific builders - _ "github.com/elastic/beats/filebeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/filebeat/autodiscover/builder/hints" ) diff --git a/filebeat/beater/acker.go b/filebeat/beater/acker.go index a157bb7ec34f..35ef0ca0beb9 100644 --- a/filebeat/beater/acker.go +++ b/filebeat/beater/acker.go @@ -18,8 +18,8 @@ package beater import ( - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/logp" ) // eventAcker handles publisher pipeline ACKs and forwards diff --git a/filebeat/beater/acker_test.go b/filebeat/beater/acker_test.go index 717812500af5..2d195c8aabde 100644 --- a/filebeat/beater/acker_test.go +++ b/filebeat/beater/acker_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/input/file" ) type mockStatefulLogger struct { diff --git a/filebeat/beater/channels.go b/filebeat/beater/channels.go index cd0eba04f48a..38874cf483a4 100644 --- a/filebeat/beater/channels.go +++ b/filebeat/beater/channels.go @@ -20,9 +20,9 @@ package beater import ( "sync" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type registrarLogger struct { diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go index 76e7e8b12f80..9589acc35a58 100644 --- a/filebeat/beater/filebeat.go +++ b/filebeat/beater/filebeat.go @@ -22,32 +22,32 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/common/reload" "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/kibana" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - - fbautodiscover "github.com/elastic/beats/filebeat/autodiscover" - "github.com/elastic/beats/filebeat/channel" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/crawler" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + + fbautodiscover "github.com/elastic/beats/v7/filebeat/autodiscover" + "github.com/elastic/beats/v7/filebeat/channel" + cfg "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/filebeat/crawler" + "github.com/elastic/beats/v7/filebeat/fileset" + "github.com/elastic/beats/v7/filebeat/registrar" // Add filebeat level processors - _ "github.com/elastic/beats/filebeat/processor/add_kubernetes_metadata" - _ "github.com/elastic/beats/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v7/filebeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" ) const pipelinesWarning = "Filebeat is unable to load the Ingest Node pipelines for the configured" + diff --git a/filebeat/beater/signalwait.go b/filebeat/beater/signalwait.go index ce8399352a30..a6115f8d7066 100644 --- a/filebeat/beater/signalwait.go +++ b/filebeat/beater/signalwait.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type signalWait struct { diff --git a/filebeat/channel/connector.go b/filebeat/channel/connector.go index d2a20dd54a2c..8f253bb13230 100644 --- a/filebeat/channel/connector.go +++ b/filebeat/channel/connector.go @@ -18,11 +18,11 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" ) // ConnectorFunc is an adapter for using ordinary functions as Connector. diff --git a/filebeat/channel/connector_test.go b/filebeat/channel/connector_test.go index f9f5cc0640c7..fe6e32991889 100644 --- a/filebeat/channel/connector_test.go +++ b/filebeat/channel/connector_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/actions" ) func TestProcessorsForConfig(t *testing.T) { diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index d4373beec19d..3bfeccc01505 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -18,10 +18,10 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" ) type OutletFactory struct { diff --git a/filebeat/channel/interface.go b/filebeat/channel/interface.go index 30b41ac0461b..0069cda6f020 100644 --- a/filebeat/channel/interface.go +++ b/filebeat/channel/interface.go @@ -18,8 +18,8 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Factory is used to create a new Outlet instance diff --git a/filebeat/channel/outlet.go b/filebeat/channel/outlet.go index ce8e5de79963..3211a9d7293e 100644 --- a/filebeat/channel/outlet.go +++ b/filebeat/channel/outlet.go @@ -18,8 +18,8 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) type outlet struct { diff --git a/filebeat/channel/util.go b/filebeat/channel/util.go index f7579b341171..2c2125534548 100644 --- a/filebeat/channel/util.go +++ b/filebeat/channel/util.go @@ -20,7 +20,7 @@ package channel import ( "sync" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type subOutlet struct { diff --git a/filebeat/channel/util_test.go b/filebeat/channel/util_test.go index c3a534f52bd8..49bd2da3094c 100644 --- a/filebeat/channel/util_test.go +++ b/filebeat/channel/util_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) type dummyOutletter struct { diff --git a/filebeat/cmd/generate.go b/filebeat/cmd/generate.go index 9b081ff6eeff..822b1acc953b 100644 --- a/filebeat/cmd/generate.go +++ b/filebeat/cmd/generate.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/filebeat/generator/fields" - "github.com/elastic/beats/filebeat/generator/fileset" - "github.com/elastic/beats/filebeat/generator/module" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/filebeat/generator/fields" + "github.com/elastic/beats/v7/filebeat/generator/fileset" + "github.com/elastic/beats/v7/filebeat/generator/module" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/filebeat/cmd/modules.go b/filebeat/cmd/modules.go index ea62e2921a2d..d07ebd78fb5d 100644 --- a/filebeat/cmd/modules.go +++ b/filebeat/cmd/modules.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" ) func buildModulesManager(beat *beat.Beat) (cmd.ModulesManager, error) { diff --git a/filebeat/cmd/root.go b/filebeat/cmd/root.go index 3cb795a2ae17..43b42a56b67f 100644 --- a/filebeat/cmd/root.go +++ b/filebeat/cmd/root.go @@ -22,14 +22,14 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/filebeat/beater" + "github.com/elastic/beats/v7/filebeat/beater" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" ) // Name of this beat diff --git a/filebeat/config/config.go b/filebeat/config/config.go index 47faaf442947..db10fa20ba6e 100644 --- a/filebeat/config/config.go +++ b/filebeat/config/config.go @@ -25,12 +25,12 @@ import ( "sort" "time" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) // Defaults for config variables which are not set diff --git a/filebeat/config/config_test.go b/filebeat/config/config_test.go index e922f743a2c5..15f9f624b28f 100644 --- a/filebeat/config/config_test.go +++ b/filebeat/config/config_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReadConfig2(t *testing.T) { diff --git a/filebeat/crawler/crawler.go b/filebeat/crawler/crawler.go index d53511b90f0a..29410080061a 100644 --- a/filebeat/crawler/crawler.go +++ b/filebeat/crawler/crawler.go @@ -21,17 +21,17 @@ import ( "fmt" "sync" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - - _ "github.com/elastic/beats/filebeat/include" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/fileset" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + + _ "github.com/elastic/beats/v7/filebeat/include" ) type Crawler struct { diff --git a/filebeat/fileset/config.go b/filebeat/fileset/config.go index 816e696fd08a..4a9937a3392f 100644 --- a/filebeat/fileset/config.go +++ b/filebeat/fileset/config.go @@ -21,9 +21,9 @@ import ( "fmt" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/paths" ) // ModuleConfig contains the configuration file options for a module diff --git a/filebeat/fileset/config_test.go b/filebeat/fileset/config_test.go index 78a1f6f5edd7..972d7eff6319 100644 --- a/filebeat/fileset/config_test.go +++ b/filebeat/fileset/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestInputSettings(t *testing.T) { diff --git a/filebeat/fileset/factory.go b/filebeat/fileset/factory.go index 2d534e045734..e7e6d30515dd 100644 --- a/filebeat/fileset/factory.go +++ b/filebeat/fileset/factory.go @@ -20,15 +20,15 @@ package fileset import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" "github.com/mitchellh/hashstructure" ) diff --git a/filebeat/fileset/fileset.go b/filebeat/fileset/fileset.go index 74cfd16c6dad..d4419c102fbf 100644 --- a/filebeat/fileset/fileset.go +++ b/filebeat/fileset/fileset.go @@ -39,10 +39,10 @@ import ( errw "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - mlimporter "github.com/elastic/beats/libbeat/ml-importer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + mlimporter "github.com/elastic/beats/v7/libbeat/ml-importer" ) // Fileset struct is the representation of a fileset. diff --git a/filebeat/fileset/fileset_test.go b/filebeat/fileset/fileset_test.go index e66eafe2b973..9f0309b25f0e 100644 --- a/filebeat/fileset/fileset_test.go +++ b/filebeat/fileset/fileset_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func getModuleForTesting(t *testing.T, module, fileset string) *Fileset { diff --git a/filebeat/fileset/flags.go b/filebeat/fileset/flags.go index 61f126327727..45297d9f3383 100644 --- a/filebeat/fileset/flags.go +++ b/filebeat/fileset/flags.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Modules related command line flags. diff --git a/filebeat/fileset/modules.go b/filebeat/fileset/modules.go index ee117194388a..6a61b286bd97 100644 --- a/filebeat/fileset/modules.go +++ b/filebeat/fileset/modules.go @@ -28,11 +28,11 @@ import ( "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" - "github.com/elastic/beats/libbeat/logp" - mlimporter "github.com/elastic/beats/libbeat/ml-importer" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/logp" + mlimporter "github.com/elastic/beats/v7/libbeat/ml-importer" + "github.com/elastic/beats/v7/libbeat/paths" ) var availableMLModules = map[string]string{ diff --git a/filebeat/fileset/modules_integration_test.go b/filebeat/fileset/modules_integration_test.go index c806ec2c7b7b..ea6d646ede21 100644 --- a/filebeat/fileset/modules_integration_test.go +++ b/filebeat/fileset/modules_integration_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/estest" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/estest" ) func TestLoadPipeline(t *testing.T) { diff --git a/filebeat/fileset/modules_test.go b/filebeat/fileset/modules_test.go index 1c0d1766d360..5a7bc46a53c3 100644 --- a/filebeat/fileset/modules_test.go +++ b/filebeat/fileset/modules_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/paths" ) func load(t *testing.T, from interface{}) *common.Config { diff --git a/filebeat/fileset/pipelines.go b/filebeat/fileset/pipelines.go index 0f21dc4a026d..db1293054632 100644 --- a/filebeat/fileset/pipelines.go +++ b/filebeat/fileset/pipelines.go @@ -24,8 +24,8 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // PipelineLoaderFactory builds and returns a PipelineLoader diff --git a/filebeat/fileset/pipelines_test.go b/filebeat/fileset/pipelines_test.go index a9758df894a2..d808639cda89 100644 --- a/filebeat/fileset/pipelines_test.go +++ b/filebeat/fileset/pipelines_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" ) func TestLoadPipelinesWithMultiPipelineFileset(t *testing.T) { diff --git a/filebeat/fileset/setup.go b/filebeat/fileset/setup.go index f6f4932ccda8..9bdb274da0a9 100644 --- a/filebeat/fileset/setup.go +++ b/filebeat/fileset/setup.go @@ -18,10 +18,10 @@ package fileset import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // SetupFactory is for loading module assets when running setup subcommand. diff --git a/filebeat/generator/fileset/fileset.go b/filebeat/generator/fileset/fileset.go index c2a49a34bd39..d17219e2c52e 100644 --- a/filebeat/generator/fileset/fileset.go +++ b/filebeat/generator/fileset/fileset.go @@ -21,7 +21,7 @@ import ( "fmt" "path" - "github.com/elastic/beats/filebeat/generator" + "github.com/elastic/beats/v7/filebeat/generator" ) // Generate creates directories and placeholder files required by a fileset. diff --git a/filebeat/generator/module/module.go b/filebeat/generator/module/module.go index 0a6f25aeaaf6..64a470dcb17e 100644 --- a/filebeat/generator/module/module.go +++ b/filebeat/generator/module/module.go @@ -22,7 +22,7 @@ import ( "os" "path" - "github.com/elastic/beats/filebeat/generator" + "github.com/elastic/beats/v7/filebeat/generator" ) // Generate creates directories and placeholder files required by a new module. diff --git a/filebeat/harvester/forwarder.go b/filebeat/harvester/forwarder.go index 935555f777f7..3bd5d51bc4c8 100644 --- a/filebeat/harvester/forwarder.go +++ b/filebeat/harvester/forwarder.go @@ -20,8 +20,8 @@ package harvester import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) // Outlet interface is used for forwarding events diff --git a/filebeat/harvester/registry.go b/filebeat/harvester/registry.go index 9a6748151a37..d0bfd10ec5cc 100644 --- a/filebeat/harvester/registry.go +++ b/filebeat/harvester/registry.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Registry struct manages (start / stop) a list of harvesters diff --git a/filebeat/harvester/util.go b/filebeat/harvester/util.go index e885aab3881b..f39a718573a4 100644 --- a/filebeat/harvester/util.go +++ b/filebeat/harvester/util.go @@ -17,7 +17,7 @@ package harvester -import "github.com/elastic/beats/libbeat/common/match" +import "github.com/elastic/beats/v7/libbeat/common/match" // Contains available input types const ( diff --git a/filebeat/harvester/util_test.go b/filebeat/harvester/util_test.go index 5a3313696b9d..0f0971a8a422 100644 --- a/filebeat/harvester/util_test.go +++ b/filebeat/harvester/util_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) // InitMatchers initializes a list of compiled regular expressions. diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index d37e8023ffee..c88ec996f42c 100644 --- a/filebeat/include/fields.go +++ b/filebeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/include/list.go b/filebeat/include/list.go index acaa460cfdfb..519d0e715819 100644 --- a/filebeat/include/list.go +++ b/filebeat/include/list.go @@ -21,33 +21,33 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/filebeat/input/container" - _ "github.com/elastic/beats/filebeat/input/docker" - _ "github.com/elastic/beats/filebeat/input/kafka" - _ "github.com/elastic/beats/filebeat/input/log" - _ "github.com/elastic/beats/filebeat/input/mqtt" - _ "github.com/elastic/beats/filebeat/input/redis" - _ "github.com/elastic/beats/filebeat/input/stdin" - _ "github.com/elastic/beats/filebeat/input/syslog" - _ "github.com/elastic/beats/filebeat/input/tcp" - _ "github.com/elastic/beats/filebeat/input/udp" - _ "github.com/elastic/beats/filebeat/module/apache" - _ "github.com/elastic/beats/filebeat/module/auditd" - _ "github.com/elastic/beats/filebeat/module/elasticsearch" - _ "github.com/elastic/beats/filebeat/module/haproxy" - _ "github.com/elastic/beats/filebeat/module/icinga" - _ "github.com/elastic/beats/filebeat/module/iis" - _ "github.com/elastic/beats/filebeat/module/kafka" - _ "github.com/elastic/beats/filebeat/module/kibana" - _ "github.com/elastic/beats/filebeat/module/logstash" - _ "github.com/elastic/beats/filebeat/module/mongodb" - _ "github.com/elastic/beats/filebeat/module/mysql" - _ "github.com/elastic/beats/filebeat/module/nats" - _ "github.com/elastic/beats/filebeat/module/nginx" - _ "github.com/elastic/beats/filebeat/module/osquery" - _ "github.com/elastic/beats/filebeat/module/postgresql" - _ "github.com/elastic/beats/filebeat/module/redis" - _ "github.com/elastic/beats/filebeat/module/santa" - _ "github.com/elastic/beats/filebeat/module/system" - _ "github.com/elastic/beats/filebeat/module/traefik" + _ "github.com/elastic/beats/v7/filebeat/input/container" + _ "github.com/elastic/beats/v7/filebeat/input/docker" + _ "github.com/elastic/beats/v7/filebeat/input/kafka" + _ "github.com/elastic/beats/v7/filebeat/input/log" + _ "github.com/elastic/beats/v7/filebeat/input/mqtt" + _ "github.com/elastic/beats/v7/filebeat/input/redis" + _ "github.com/elastic/beats/v7/filebeat/input/stdin" + _ "github.com/elastic/beats/v7/filebeat/input/syslog" + _ "github.com/elastic/beats/v7/filebeat/input/tcp" + _ "github.com/elastic/beats/v7/filebeat/input/udp" + _ "github.com/elastic/beats/v7/filebeat/module/apache" + _ "github.com/elastic/beats/v7/filebeat/module/auditd" + _ "github.com/elastic/beats/v7/filebeat/module/elasticsearch" + _ "github.com/elastic/beats/v7/filebeat/module/haproxy" + _ "github.com/elastic/beats/v7/filebeat/module/icinga" + _ "github.com/elastic/beats/v7/filebeat/module/iis" + _ "github.com/elastic/beats/v7/filebeat/module/kafka" + _ "github.com/elastic/beats/v7/filebeat/module/kibana" + _ "github.com/elastic/beats/v7/filebeat/module/logstash" + _ "github.com/elastic/beats/v7/filebeat/module/mongodb" + _ "github.com/elastic/beats/v7/filebeat/module/mysql" + _ "github.com/elastic/beats/v7/filebeat/module/nats" + _ "github.com/elastic/beats/v7/filebeat/module/nginx" + _ "github.com/elastic/beats/v7/filebeat/module/osquery" + _ "github.com/elastic/beats/v7/filebeat/module/postgresql" + _ "github.com/elastic/beats/v7/filebeat/module/redis" + _ "github.com/elastic/beats/v7/filebeat/module/santa" + _ "github.com/elastic/beats/v7/filebeat/module/system" + _ "github.com/elastic/beats/v7/filebeat/module/traefik" ) diff --git a/filebeat/input/config.go b/filebeat/input/config.go index 750b370419b6..448a878a607d 100644 --- a/filebeat/input/config.go +++ b/filebeat/input/config.go @@ -20,8 +20,8 @@ package input import ( "time" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/libbeat/common/cfgwarn" + cfg "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) var ( diff --git a/filebeat/input/container/input.go b/filebeat/input/container/input.go index 656b93b47fd1..b208cd16013d 100644 --- a/filebeat/input/container/input.go +++ b/filebeat/input/container/input.go @@ -18,10 +18,10 @@ package container import ( - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/log" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" ) diff --git a/filebeat/input/docker/input.go b/filebeat/input/docker/input.go index 750d6d8d68c5..70df9ce2238a 100644 --- a/filebeat/input/docker/input.go +++ b/filebeat/input/docker/input.go @@ -21,12 +21,12 @@ import ( "fmt" "path" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/log" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/pkg/errors" ) diff --git a/filebeat/input/file/file.go b/filebeat/input/file/file.go index c3bc1bb624ad..676a2d5cfcb6 100644 --- a/filebeat/input/file/file.go +++ b/filebeat/input/file/file.go @@ -20,7 +20,7 @@ package file import ( "os" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type File struct { diff --git a/filebeat/input/file/state.go b/filebeat/input/file/state.go index 96c5abf2071f..dde3c6c54217 100644 --- a/filebeat/input/file/state.go +++ b/filebeat/input/file/state.go @@ -25,7 +25,7 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) // State is used to communicate the reading state of a file diff --git a/filebeat/input/file/states.go b/filebeat/input/file/states.go index d01026f87768..fc50dd904c0b 100644 --- a/filebeat/input/file/states.go +++ b/filebeat/input/file/states.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // States handles list of FileState. One must use NewStates to instantiate a diff --git a/filebeat/input/input.go b/filebeat/input/input.go index e1931d4e4bfa..06e62e035555 100644 --- a/filebeat/input/input.go +++ b/filebeat/input/input.go @@ -24,11 +24,11 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/filebeat/input/kafka/config.go b/filebeat/input/kafka/config.go index 6fb14730aea3..d36b46772333 100644 --- a/filebeat/input/kafka/config.go +++ b/filebeat/input/kafka/config.go @@ -24,12 +24,12 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/outputs" ) type kafkaInputConfig struct { diff --git a/filebeat/input/kafka/input.go b/filebeat/input/kafka/input.go index 72cb12542840..5dadb0585124 100644 --- a/filebeat/input/kafka/input.go +++ b/filebeat/input/kafka/input.go @@ -27,13 +27,13 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/pkg/errors" ) diff --git a/filebeat/input/kafka/kafka_integration_test.go b/filebeat/input/kafka/kafka_integration_test.go index ca4d03a8d9c5..c7ad9fc999cb 100644 --- a/filebeat/input/kafka/kafka_integration_test.go +++ b/filebeat/input/kafka/kafka_integration_test.go @@ -32,12 +32,12 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" ) const ( diff --git a/filebeat/input/log/config.go b/filebeat/input/log/config.go index 78669b4c107e..835358b4e66d 100644 --- a/filebeat/input/log/config.go +++ b/filebeat/input/log/config.go @@ -24,15 +24,15 @@ import ( "github.com/dustin/go-humanize" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readjson" + cfg "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader/multiline" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readjson" ) var ( diff --git a/filebeat/input/log/config_test.go b/filebeat/input/log/config_test.go index bf73d0412b03..7406014d049e 100644 --- a/filebeat/input/log/config_test.go +++ b/filebeat/input/log/config_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) func TestCleanOlderError(t *testing.T) { diff --git a/filebeat/input/log/file.go b/filebeat/input/log/file.go index 59d408c87adf..27858c0c4c7f 100644 --- a/filebeat/input/log/file.go +++ b/filebeat/input/log/file.go @@ -20,7 +20,7 @@ package log import ( "os" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) type File struct { diff --git a/filebeat/input/log/harvester.go b/filebeat/input/log/harvester.go index 5f0c47c98784..94162ebfec97 100644 --- a/filebeat/input/log/harvester.go +++ b/filebeat/input/log/harvester.go @@ -39,21 +39,21 @@ import ( "github.com/gofrs/uuid" "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - file_helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/debug" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" - "github.com/elastic/beats/libbeat/reader/readjson" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + file_helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/debug" + "github.com/elastic/beats/v7/libbeat/reader/multiline" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader/readjson" ) var ( diff --git a/filebeat/input/log/harvester_test.go b/filebeat/input/log/harvester_test.go index 2ee03824efbb..96ae5c7e5ed0 100644 --- a/filebeat/input/log/harvester_test.go +++ b/filebeat/input/log/harvester_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) func TestReadLine(t *testing.T) { diff --git a/filebeat/input/log/input.go b/filebeat/input/log/input.go index 24cbdf33abc0..ac0d71cf53d6 100644 --- a/filebeat/input/log/input.go +++ b/filebeat/input/log/input.go @@ -27,15 +27,15 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) const ( diff --git a/filebeat/input/log/input_other_test.go b/filebeat/input/log/input_other_test.go index 9eb2a7ba4b88..e37b4d0c1f21 100644 --- a/filebeat/input/log/input_other_test.go +++ b/filebeat/input/log/input_other_test.go @@ -22,8 +22,8 @@ package log import ( "testing" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common/match" "github.com/stretchr/testify/assert" ) diff --git a/filebeat/input/log/input_test.go b/filebeat/input/log/input_test.go index eaf080d39d6b..0eb7d1899d7d 100644 --- a/filebeat/input/log/input_test.go +++ b/filebeat/input/log/input_test.go @@ -29,13 +29,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) func TestInputFileExclude(t *testing.T) { diff --git a/filebeat/input/log/log.go b/filebeat/input/log/log.go index 79bc5f145053..1a89c5bc8d14 100644 --- a/filebeat/input/log/log.go +++ b/filebeat/input/log/log.go @@ -22,9 +22,9 @@ import ( "os" "time" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/logp" ) // Log contains all log related data diff --git a/filebeat/input/log/prospector_windows_test.go b/filebeat/input/log/prospector_windows_test.go index 92183cdb1ed6..2b60fac4c649 100644 --- a/filebeat/input/log/prospector_windows_test.go +++ b/filebeat/input/log/prospector_windows_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) var matchTestsWindows = []struct { diff --git a/filebeat/input/mqtt/client.go b/filebeat/input/mqtt/client.go index 73e8d2f53441..b87884fd9bf9 100644 --- a/filebeat/input/mqtt/client.go +++ b/filebeat/input/mqtt/client.go @@ -20,7 +20,7 @@ package mqtt import ( libmqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/elastic/beats/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs" ) func createClientOptions(config mqttInputConfig, onConnectHandler func(client libmqtt.Client)) (*libmqtt.ClientOptions, error) { diff --git a/filebeat/input/mqtt/client_mocked.go b/filebeat/input/mqtt/client_mocked.go index dadccdf93565..2ac2ccb77a03 100644 --- a/filebeat/input/mqtt/client_mocked.go +++ b/filebeat/input/mqtt/client_mocked.go @@ -22,10 +22,10 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" ) type mockedMessage struct { diff --git a/filebeat/input/mqtt/config.go b/filebeat/input/mqtt/config.go index 6a1ed8ca1e91..c4fbe2b77359 100644 --- a/filebeat/input/mqtt/config.go +++ b/filebeat/input/mqtt/config.go @@ -20,7 +20,7 @@ package mqtt import ( "errors" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) type mqttInputConfig struct { diff --git a/filebeat/input/mqtt/input.go b/filebeat/input/mqtt/input.go index f2edab19b6fc..a802a43c6281 100644 --- a/filebeat/input/mqtt/input.go +++ b/filebeat/input/mqtt/input.go @@ -25,12 +25,12 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/filebeat/input/mqtt/input_test.go b/filebeat/input/mqtt/input_test.go index 3e54e17f1180..cc6bf4b05b77 100644 --- a/filebeat/input/mqtt/input_test.go +++ b/filebeat/input/mqtt/input_test.go @@ -26,11 +26,11 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/require" - finput "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/logp" + finput "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/logp" ) var logger = logp.NewLogger("test") diff --git a/filebeat/input/mqtt/logging.go b/filebeat/input/mqtt/logging.go index 35510c20b348..fde4a0b8513a 100644 --- a/filebeat/input/mqtt/logging.go +++ b/filebeat/input/mqtt/logging.go @@ -23,7 +23,7 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "go.uber.org/zap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var setupLoggingOnce sync.Once diff --git a/filebeat/input/mqtt/mqtt_integration_test.go b/filebeat/input/mqtt/mqtt_integration_test.go index 3fd3506cbf40..60b8c595afc2 100644 --- a/filebeat/input/mqtt/mqtt_integration_test.go +++ b/filebeat/input/mqtt/mqtt_integration_test.go @@ -29,11 +29,11 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/require" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/filebeat/input/plugin.go b/filebeat/input/plugin.go index 364fa57a718b..c0d273d97e2b 100644 --- a/filebeat/input/plugin.go +++ b/filebeat/input/plugin.go @@ -20,7 +20,7 @@ package input import ( "errors" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" ) type inputPlugin struct { diff --git a/filebeat/input/redis/config.go b/filebeat/input/redis/config.go index b5829b6defc4..1177fd8bb1b2 100644 --- a/filebeat/input/redis/config.go +++ b/filebeat/input/redis/config.go @@ -20,7 +20,7 @@ package redis import ( "time" - "github.com/elastic/beats/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) var defaultConfig = config{ diff --git a/filebeat/input/redis/harvester.go b/filebeat/input/redis/harvester.go index 73b9111a8725..49d153cf26c0 100644 --- a/filebeat/input/redis/harvester.go +++ b/filebeat/input/redis/harvester.go @@ -25,11 +25,11 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) // Harvester contains all redis harvester data diff --git a/filebeat/input/redis/input.go b/filebeat/input/redis/input.go index f4909e2c6a5a..a784af74c055 100644 --- a/filebeat/input/redis/input.go +++ b/filebeat/input/redis/input.go @@ -22,14 +22,14 @@ import ( rd "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/registry.go b/filebeat/input/registry.go index 69e2d942bef4..06b23d3ac189 100644 --- a/filebeat/input/registry.go +++ b/filebeat/input/registry.go @@ -20,10 +20,10 @@ package input import ( "fmt" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type Context struct { diff --git a/filebeat/input/registry_test.go b/filebeat/input/registry_test.go index ca6857781868..0532d5ac8bcf 100644 --- a/filebeat/input/registry_test.go +++ b/filebeat/input/registry_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/libbeat/common" ) var fakeFactory = func(_ *common.Config, _ channel.Connector, _ Context) (Input, error) { diff --git a/filebeat/input/runnerfactory.go b/filebeat/input/runnerfactory.go index c4bb0818031c..d41382fe01fb 100644 --- a/filebeat/input/runnerfactory.go +++ b/filebeat/input/runnerfactory.go @@ -18,11 +18,11 @@ package input import ( - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" ) // RunnerFactory is a factory for registrars diff --git a/filebeat/input/stdin/input.go b/filebeat/input/stdin/input.go index f59c0da521e8..8273da27f622 100644 --- a/filebeat/input/stdin/input.go +++ b/filebeat/input/stdin/input.go @@ -20,14 +20,14 @@ package stdin import ( "fmt" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/input/log" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/syslog/config.go b/filebeat/input/syslog/config.go index 4e8eecc74b40..28590b3ced36 100644 --- a/filebeat/input/syslog/config.go +++ b/filebeat/input/syslog/config.go @@ -23,11 +23,11 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/tcp" - "github.com/elastic/beats/filebeat/inputsource/udp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/libbeat/common" ) type config struct { diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go index 71efa8bcfc71..24271c6fe4b3 100644 --- a/filebeat/input/syslog/input.go +++ b/filebeat/input/syslog/input.go @@ -24,19 +24,19 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // Parser is generated from a ragel state machine using the following command: //go:generate ragel -Z -G2 parser.rl -o parser.go -//go:generate go fmt parser.go +//go:generate goimports -l -w parser.go // Severity and Facility are derived from the priority, theses are the human readable terms // defined in https://tools.ietf.org/html/rfc3164#section-4.1.1. diff --git a/filebeat/input/syslog/input_test.go b/filebeat/input/syslog/input_test.go index f52d235e3a48..b6c29b74a519 100644 --- a/filebeat/input/syslog/input_test.go +++ b/filebeat/input/syslog/input_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestWhenPriorityIsSet(t *testing.T) { diff --git a/filebeat/input/tcp/config.go b/filebeat/input/tcp/config.go index 4e07fa91f896..3bc928ac8c05 100644 --- a/filebeat/input/tcp/config.go +++ b/filebeat/input/tcp/config.go @@ -22,8 +22,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource/tcp" ) type config struct { diff --git a/filebeat/input/tcp/input.go b/filebeat/input/tcp/input.go index 77a7162b0395..9c0b7476f90a 100644 --- a/filebeat/input/tcp/input.go +++ b/filebeat/input/tcp/input.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/tcp" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/tcp/input_test.go b/filebeat/input/tcp/input_test.go index a7ca64ba59d5..d820e0687236 100644 --- a/filebeat/input/tcp/input_test.go +++ b/filebeat/input/tcp/input_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource" ) func TestCreateEvent(t *testing.T) { diff --git a/filebeat/input/udp/config.go b/filebeat/input/udp/config.go index 65e522920b7a..33696dc69c72 100644 --- a/filebeat/input/udp/config.go +++ b/filebeat/input/udp/config.go @@ -22,8 +22,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource/udp" ) var defaultConfig = config{ diff --git a/filebeat/input/udp/input.go b/filebeat/input/udp/input.go index 30bb818d2a57..9d5f45208908 100644 --- a/filebeat/input/udp/input.go +++ b/filebeat/input/udp/input.go @@ -21,14 +21,14 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/udp" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/inputsource/tcp/config.go b/filebeat/inputsource/tcp/config.go index f63481796274..3eb25c42d9aa 100644 --- a/filebeat/inputsource/tcp/config.go +++ b/filebeat/inputsource/tcp/config.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/cfgtype" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Name is the human readable name and identifier. diff --git a/filebeat/inputsource/tcp/handler.go b/filebeat/inputsource/tcp/handler.go index eeb5d5088b69..455cc76909f0 100644 --- a/filebeat/inputsource/tcp/handler.go +++ b/filebeat/inputsource/tcp/handler.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" ) // splitHandler is a TCP client that has splitting capabilities. diff --git a/filebeat/inputsource/tcp/server.go b/filebeat/inputsource/tcp/server.go index df7343f9947c..04a6df4559c2 100644 --- a/filebeat/inputsource/tcp/server.go +++ b/filebeat/inputsource/tcp/server.go @@ -27,10 +27,10 @@ import ( "golang.org/x/net/netutil" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Server represent a TCP server diff --git a/filebeat/inputsource/tcp/server_test.go b/filebeat/inputsource/tcp/server_test.go index 82e89fb72a75..4e25ef74892b 100644 --- a/filebeat/inputsource/tcp/server_test.go +++ b/filebeat/inputsource/tcp/server_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common" ) var defaultConfig = Config{ diff --git a/filebeat/inputsource/udp/config.go b/filebeat/inputsource/udp/config.go index f269a805cb59..6c8646384555 100644 --- a/filebeat/inputsource/udp/config.go +++ b/filebeat/inputsource/udp/config.go @@ -20,7 +20,7 @@ package udp import ( "time" - "github.com/elastic/beats/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" ) // Config options for the UDPServer diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index 2c8cc9200aad..9df2e57904a4 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -26,8 +26,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/logp" ) // Name is the human readable name and identifier. diff --git a/filebeat/inputsource/udp/server_test.go b/filebeat/inputsource/udp/server_test.go index 3c94349fa2b0..766f7d0b7aa5 100644 --- a/filebeat/inputsource/udp/server_test.go +++ b/filebeat/inputsource/udp/server_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource" ) const maxMessageSize = 20 diff --git a/filebeat/magefile.go b/filebeat/magefile.go index 0331512e45bb..9b5e58f31cea 100644 --- a/filebeat/magefile.go +++ b/filebeat/magefile.go @@ -26,13 +26,13 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - filebeat "github.com/elastic/beats/filebeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + filebeat "github.com/elastic/beats/v7/filebeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import generate - _ "github.com/elastic/beats/filebeat/scripts/mage/generate" + _ "github.com/elastic/beats/v7/filebeat/scripts/mage/generate" ) func init() { diff --git a/filebeat/main.go b/filebeat/main.go index c0b3c2c0b923..21289acdf6f9 100644 --- a/filebeat/main.go +++ b/filebeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/filebeat/cmd" + "github.com/elastic/beats/v7/filebeat/cmd" ) // The basic model of execution: diff --git a/filebeat/main_test.go b/filebeat/main_test.go index 075487d60ec5..84f3e686e4c3 100644 --- a/filebeat/main_test.go +++ b/filebeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/filebeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/filebeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/filebeat/module/apache/fields.go b/filebeat/module/apache/fields.go index ba11297c42ff..c1e04806ad5f 100644 --- a/filebeat/module/apache/fields.go +++ b/filebeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/auditd/fields.go b/filebeat/module/auditd/fields.go index 41ffa6beb71b..6dc1d8a8a5ed 100644 --- a/filebeat/module/auditd/fields.go +++ b/filebeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/elasticsearch/fields.go b/filebeat/module/elasticsearch/fields.go index 2d7b16f74d0f..98808ad5e05a 100644 --- a/filebeat/module/elasticsearch/fields.go +++ b/filebeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/haproxy/fields.go b/filebeat/module/haproxy/fields.go index 9b572b78dbcd..8b9176b7cfe3 100644 --- a/filebeat/module/haproxy/fields.go +++ b/filebeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/icinga/fields.go b/filebeat/module/icinga/fields.go index 7307a8522974..a442241f22a4 100644 --- a/filebeat/module/icinga/fields.go +++ b/filebeat/module/icinga/fields.go @@ -20,7 +20,7 @@ package icinga import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/iis/fields.go b/filebeat/module/iis/fields.go index a234fc3847b4..a2638d7ddb88 100644 --- a/filebeat/module/iis/fields.go +++ b/filebeat/module/iis/fields.go @@ -20,7 +20,7 @@ package iis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/kafka/fields.go b/filebeat/module/kafka/fields.go index ed538d21f99b..86950968bf0b 100644 --- a/filebeat/module/kafka/fields.go +++ b/filebeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/kibana/fields.go b/filebeat/module/kibana/fields.go index ab0297c148e5..d5733c14aa17 100644 --- a/filebeat/module/kibana/fields.go +++ b/filebeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/logstash/fields.go b/filebeat/module/logstash/fields.go index 70fb188699e8..2097117ebf70 100644 --- a/filebeat/module/logstash/fields.go +++ b/filebeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/mongodb/fields.go b/filebeat/module/mongodb/fields.go index 564680f6998f..b6e51a3838b7 100644 --- a/filebeat/module/mongodb/fields.go +++ b/filebeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/mysql/fields.go b/filebeat/module/mysql/fields.go index 0e53ab01b338..fba7746ab833 100644 --- a/filebeat/module/mysql/fields.go +++ b/filebeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/nats/fields.go b/filebeat/module/nats/fields.go index 825c42644a14..77551238beac 100644 --- a/filebeat/module/nats/fields.go +++ b/filebeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/nginx/fields.go b/filebeat/module/nginx/fields.go index e45823e11ebd..df2afc9669e4 100644 --- a/filebeat/module/nginx/fields.go +++ b/filebeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/osquery/fields.go b/filebeat/module/osquery/fields.go index 7f423fda95b2..98f1d9db0fb2 100644 --- a/filebeat/module/osquery/fields.go +++ b/filebeat/module/osquery/fields.go @@ -20,7 +20,7 @@ package osquery import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/postgresql/fields.go b/filebeat/module/postgresql/fields.go index 573e617dcd9d..1ef2040d458d 100644 --- a/filebeat/module/postgresql/fields.go +++ b/filebeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/redis/fields.go b/filebeat/module/redis/fields.go index 49ac22676a45..66298b24738f 100644 --- a/filebeat/module/redis/fields.go +++ b/filebeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/santa/fields.go b/filebeat/module/santa/fields.go index cc67c59b2b22..06b53e41d848 100644 --- a/filebeat/module/santa/fields.go +++ b/filebeat/module/santa/fields.go @@ -20,7 +20,7 @@ package santa import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/system/fields.go b/filebeat/module/system/fields.go index 4cfa76bf8c71..dcf2568f5e1c 100644 --- a/filebeat/module/system/fields.go +++ b/filebeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/traefik/fields.go b/filebeat/module/traefik/fields.go index b5b1fc8935e7..f7e75e94d570 100644 --- a/filebeat/module/traefik/fields.go +++ b/filebeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/processor/add_kubernetes_metadata/matchers.go b/filebeat/processor/add_kubernetes_metadata/matchers.go index 5f0f6b0a8188..805e55fb43b5 100644 --- a/filebeat/processor/add_kubernetes_metadata/matchers.go +++ b/filebeat/processor/add_kubernetes_metadata/matchers.go @@ -23,9 +23,9 @@ import ( "runtime" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/filebeat/processor/add_kubernetes_metadata/matchers_test.go b/filebeat/processor/add_kubernetes_metadata/matchers_test.go index 0c8c64d5387d..82addc9d3b43 100644 --- a/filebeat/processor/add_kubernetes_metadata/matchers_test.go +++ b/filebeat/processor/add_kubernetes_metadata/matchers_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // A random container ID that we use for our tests diff --git a/filebeat/registrar/migrate.go b/filebeat/registrar/migrate.go index a48df0477c45..64d2b4579a8c 100644 --- a/filebeat/registrar/migrate.go +++ b/filebeat/registrar/migrate.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/filebeat/registrar/registrar.go b/filebeat/registrar/registrar.go index 22fdd1b60662..61b9c2608e1a 100644 --- a/filebeat/registrar/registrar.go +++ b/filebeat/registrar/registrar.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/input/file" - helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/filebeat/input/file" + helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/paths" ) type Registrar struct { diff --git a/filebeat/registrar/registrar_test.go b/filebeat/registrar/registrar_test.go index 102b073dffad..58d5d5acff81 100644 --- a/filebeat/registrar/registrar_test.go +++ b/filebeat/registrar/registrar_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/input/file" ) func TestRegistrarRead(t *testing.T) { diff --git a/filebeat/scripts/mage/config.go b/filebeat/scripts/mage/config.go index 23abad70ac59..7585c62b634a 100644 --- a/filebeat/scripts/mage/config.go +++ b/filebeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml" diff --git a/filebeat/scripts/mage/docs.go b/filebeat/scripts/mage/docs.go index ae124600ca07..fd12ce859a8d 100644 --- a/filebeat/scripts/mage/docs.go +++ b/filebeat/scripts/mage/docs.go @@ -20,7 +20,7 @@ package mage import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // CollectDocs executes the Filebeat docs_collector script to collect/generate diff --git a/filebeat/scripts/mage/generate/fields.go b/filebeat/scripts/mage/generate/fields.go index 9bc8a8af40a1..01bc6a1c46af 100644 --- a/filebeat/scripts/mage/generate/fields.go +++ b/filebeat/scripts/mage/generate/fields.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/dev-tools/mage" - genfields "github.com/elastic/beats/filebeat/generator/fields" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genfields "github.com/elastic/beats/v7/filebeat/generator/fields" ) // Fields creates a new fields.yml for an existing Filebeat fileset. diff --git a/filebeat/scripts/mage/generate/fileset.go b/filebeat/scripts/mage/generate/fileset.go index 612567a11045..ff54b2546324 100644 --- a/filebeat/scripts/mage/generate/fileset.go +++ b/filebeat/scripts/mage/generate/fileset.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/dev-tools/mage" - genfileset "github.com/elastic/beats/filebeat/generator/fileset" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genfileset "github.com/elastic/beats/v7/filebeat/generator/fileset" ) // Fileset creates a new fileset for an existing Filebeat module. diff --git a/filebeat/scripts/mage/generate/module.go b/filebeat/scripts/mage/generate/module.go index 5d14e3ec09f5..6995d483c779 100644 --- a/filebeat/scripts/mage/generate/module.go +++ b/filebeat/scripts/mage/generate/module.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/dev-tools/mage" - genmod "github.com/elastic/beats/filebeat/generator/module" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genmod "github.com/elastic/beats/v7/filebeat/generator/module" ) // Module creates a new Filebeat module. diff --git a/filebeat/scripts/mage/package.go b/filebeat/scripts/mage/package.go index 9de7c6c959c4..8a0819caf5ae 100644 --- a/filebeat/scripts/mage/package.go +++ b/filebeat/scripts/mage/package.go @@ -21,7 +21,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/filebeat/scripts/tester/main.go b/filebeat/scripts/tester/main.go index 63ecd2a69aa2..2ae9de443882 100644 --- a/filebeat/scripts/tester/main.go +++ b/filebeat/scripts/tester/main.go @@ -29,12 +29,12 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/multiline" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) type logReaderConfig struct { diff --git a/generator/beat/.gitignore b/generator/_templates/beat/.gitignore similarity index 100% rename from generator/beat/.gitignore rename to generator/_templates/beat/.gitignore diff --git a/generator/beat/CHANGELOG.md b/generator/_templates/beat/CHANGELOG.md similarity index 100% rename from generator/beat/CHANGELOG.md rename to generator/_templates/beat/CHANGELOG.md diff --git a/generator/_templates/beat/Makefile b/generator/_templates/beat/Makefile new file mode 100644 index 000000000000..7c476dc5f6ef --- /dev/null +++ b/generator/_templates/beat/Makefile @@ -0,0 +1 @@ +include ../../common/Makefile diff --git a/generator/beat/README.md b/generator/_templates/beat/README.md similarity index 100% rename from generator/beat/README.md rename to generator/_templates/beat/README.md diff --git a/generator/beat/{beat}/.editorconfig b/generator/_templates/beat/{beat}/.editorconfig similarity index 100% rename from generator/beat/{beat}/.editorconfig rename to generator/_templates/beat/{beat}/.editorconfig diff --git a/generator/beat/{beat}/.gitignore b/generator/_templates/beat/{beat}/.gitignore similarity index 100% rename from generator/beat/{beat}/.gitignore rename to generator/_templates/beat/{beat}/.gitignore diff --git a/generator/beat/{beat}/.travis.yml b/generator/_templates/beat/{beat}/.travis.yml similarity index 100% rename from generator/beat/{beat}/.travis.yml rename to generator/_templates/beat/{beat}/.travis.yml diff --git a/generator/beat/{beat}/CONTRIBUTING.md b/generator/_templates/beat/{beat}/CONTRIBUTING.md similarity index 100% rename from generator/beat/{beat}/CONTRIBUTING.md rename to generator/_templates/beat/{beat}/CONTRIBUTING.md diff --git a/generator/beat/{beat}/LICENSE.txt b/generator/_templates/beat/{beat}/LICENSE.txt similarity index 100% rename from generator/beat/{beat}/LICENSE.txt rename to generator/_templates/beat/{beat}/LICENSE.txt diff --git a/generator/beat/{beat}/Makefile b/generator/_templates/beat/{beat}/Makefile similarity index 100% rename from generator/beat/{beat}/Makefile rename to generator/_templates/beat/{beat}/Makefile diff --git a/generator/beat/{beat}/NOTICE.txt b/generator/_templates/beat/{beat}/NOTICE.txt similarity index 100% rename from generator/beat/{beat}/NOTICE.txt rename to generator/_templates/beat/{beat}/NOTICE.txt diff --git a/generator/beat/{beat}/README.md b/generator/_templates/beat/{beat}/README.md similarity index 100% rename from generator/beat/{beat}/README.md rename to generator/_templates/beat/{beat}/README.md diff --git a/generator/beat/{beat}/_meta/beat.docker.yml b/generator/_templates/beat/{beat}/_meta/beat.docker.yml similarity index 100% rename from generator/beat/{beat}/_meta/beat.docker.yml rename to generator/_templates/beat/{beat}/_meta/beat.docker.yml diff --git a/generator/beat/{beat}/_meta/beat.yml b/generator/_templates/beat/{beat}/_meta/beat.yml similarity index 100% rename from generator/beat/{beat}/_meta/beat.yml rename to generator/_templates/beat/{beat}/_meta/beat.yml diff --git a/generator/beat/{beat}/_meta/fields.yml b/generator/_templates/beat/{beat}/_meta/fields.yml similarity index 100% rename from generator/beat/{beat}/_meta/fields.yml rename to generator/_templates/beat/{beat}/_meta/fields.yml diff --git a/generator/beat/{beat}/beater/{beat}.go b/generator/_templates/beat/{beat}/beater/{beat}.go similarity index 89% rename from generator/beat/{beat}/beater/{beat}.go rename to generator/_templates/beat/{beat}/beater/{beat}.go index 8031896402b7..236c3d663901 100644 --- a/generator/beat/{beat}/beater/{beat}.go +++ b/generator/_templates/beat/{beat}/beater/{beat}.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "{beat_path}/config" ) diff --git a/generator/_templates/beat/{beat}/cmd/root.go b/generator/_templates/beat/{beat}/cmd/root.go new file mode 100644 index 000000000000..9607edb86a2f --- /dev/null +++ b/generator/_templates/beat/{beat}/cmd/root.go @@ -0,0 +1,14 @@ +package cmd + +import ( + "{beat_path}/beater" + + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" +) + +// Name of this beat +var Name = "{beat}" + +// RootCmd to handle beats cli +var RootCmd = cmd.GenRootCmdWithSettings(beater.New, instance.Settings{Name: Name}) diff --git a/generator/beat/{beat}/config/config.go b/generator/_templates/beat/{beat}/config/config.go similarity index 100% rename from generator/beat/{beat}/config/config.go rename to generator/_templates/beat/{beat}/config/config.go diff --git a/generator/beat/{beat}/config/config_test.go b/generator/_templates/beat/{beat}/config/config_test.go similarity index 100% rename from generator/beat/{beat}/config/config_test.go rename to generator/_templates/beat/{beat}/config/config_test.go diff --git a/generator/beat/{beat}/docs/index.asciidoc b/generator/_templates/beat/{beat}/docs/index.asciidoc similarity index 100% rename from generator/beat/{beat}/docs/index.asciidoc rename to generator/_templates/beat/{beat}/docs/index.asciidoc diff --git a/generator/_templates/beat/{beat}/magefile.go b/generator/_templates/beat/{beat}/magefile.go new file mode 100644 index 000000000000..b79448c2aaa5 --- /dev/null +++ b/generator/_templates/beat/{beat}/magefile.go @@ -0,0 +1,102 @@ +// +build mage + +package main + +import ( + "fmt" + "time" + + "github.com/magefile/mage/mg" + "github.com/magefile/mage/sh" + + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/target/build" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/generator/common/beatgen" +) + +func init() { + devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) + + devtools.BeatDescription = "One sentence description of the Beat." + devtools.BeatVendor = "{full_name}" + devtools.BeatProjectType = devtools.CommunityProject +} + +// VendorUpdate updates elastic/beats/v7 in the vendor dir +func VendorUpdate() error { + return beatgen.VendorUpdate() +} + +// Package packages the Beat for distribution. +// Use SNAPSHOT=true to build snapshots. +// Use PLATFORMS to control the target platforms. +func Package() { + start := time.Now() + defer func() { fmt.Println("package ran for", time.Since(start)) }() + + devtools.UseCommunityBeatPackaging() + + mg.Deps(Update) + mg.Deps(build.CrossBuild, build.CrossBuildGoDaemon) + mg.SerialDeps(devtools.Package, pkg.PackageTest) +} + +// Update updates the generated files (aka make update). +func Update() error { + return sh.Run("make", "update") +} + +// Fields generates a fields.yml for the Beat. +func Fields() error { + return devtools.GenerateFieldsYAML() +} + +// Config generates both the short/reference/docker configs. +func Config() error { + return devtools.Config(devtools.AllConfigTypes, devtools.ConfigFileParams{}, ".") +} + +// Clean cleans all generated files and build artifacts. +func Clean() error { + return devtools.Clean() +} + +// Check formats code, updates generated content, check for common errors, and +// checks for any modified files. +func Check() { + common.Check() +} + +// Fmt formats source code (.go and .py) and adds license headers. +func Fmt() { + common.Fmt() +} + +// Test runs all available tests +func Test() { + mg.Deps(unittest.GoUnitTest) +} + +// Build builds the Beat binary. +func Build() error { + return build.Build() +} + +// CrossBuild cross-builds the beat for all target platforms. +func CrossBuild() error { + return build.CrossBuild() +} + +// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon). +func BuildGoDaemon() error { + return build.BuildGoDaemon() +} + +// GolangCrossBuild build the Beat binary inside of the golang-builder. +// Do not use directly, use crossBuild instead. +func GolangCrossBuild() error { + return build.GolangCrossBuild() +} diff --git a/generator/beat/{beat}/main.go b/generator/_templates/beat/{beat}/main.go similarity index 100% rename from generator/beat/{beat}/main.go rename to generator/_templates/beat/{beat}/main.go diff --git a/generator/beat/{beat}/main_test.go b/generator/_templates/beat/{beat}/main_test.go similarity index 100% rename from generator/beat/{beat}/main_test.go rename to generator/_templates/beat/{beat}/main_test.go diff --git a/generator/beat/{beat}/make.bat b/generator/_templates/beat/{beat}/make.bat similarity index 100% rename from generator/beat/{beat}/make.bat rename to generator/_templates/beat/{beat}/make.bat diff --git a/generator/beat/{beat}/tests/system/config/{beat}.yml.j2 b/generator/_templates/beat/{beat}/tests/system/config/{beat}.yml.j2 similarity index 100% rename from generator/beat/{beat}/tests/system/config/{beat}.yml.j2 rename to generator/_templates/beat/{beat}/tests/system/config/{beat}.yml.j2 diff --git a/generator/beat/{beat}/tests/system/requirements.txt b/generator/_templates/beat/{beat}/tests/system/requirements.txt similarity index 100% rename from generator/beat/{beat}/tests/system/requirements.txt rename to generator/_templates/beat/{beat}/tests/system/requirements.txt diff --git a/generator/beat/{beat}/tests/system/test_base.py b/generator/_templates/beat/{beat}/tests/system/test_base.py similarity index 100% rename from generator/beat/{beat}/tests/system/test_base.py rename to generator/_templates/beat/{beat}/tests/system/test_base.py diff --git a/generator/beat/{beat}/tests/system/{beat}.py b/generator/_templates/beat/{beat}/tests/system/{beat}.py similarity index 100% rename from generator/beat/{beat}/tests/system/{beat}.py rename to generator/_templates/beat/{beat}/tests/system/{beat}.py diff --git a/generator/metricbeat/.gitignore b/generator/_templates/metricbeat/.gitignore similarity index 100% rename from generator/metricbeat/.gitignore rename to generator/_templates/metricbeat/.gitignore diff --git a/generator/metricbeat/CHANGELOG.md b/generator/_templates/metricbeat/CHANGELOG.md similarity index 100% rename from generator/metricbeat/CHANGELOG.md rename to generator/_templates/metricbeat/CHANGELOG.md diff --git a/generator/metricbeat/LICENSE b/generator/_templates/metricbeat/LICENSE similarity index 100% rename from generator/metricbeat/LICENSE rename to generator/_templates/metricbeat/LICENSE diff --git a/generator/_templates/metricbeat/Makefile b/generator/_templates/metricbeat/Makefile new file mode 100644 index 000000000000..d58cf4922bb8 --- /dev/null +++ b/generator/_templates/metricbeat/Makefile @@ -0,0 +1,7 @@ +BEAT_TYPE = metricbeat + +include ../../common/Makefile + +# Collects all dependencies and then calls update +.PHONY: collect +collect: diff --git a/generator/metricbeat/README.md b/generator/_templates/metricbeat/README.md similarity index 100% rename from generator/metricbeat/README.md rename to generator/_templates/metricbeat/README.md diff --git a/generator/metricbeat/{beat}/.editorconfig b/generator/_templates/metricbeat/{beat}/.editorconfig similarity index 100% rename from generator/metricbeat/{beat}/.editorconfig rename to generator/_templates/metricbeat/{beat}/.editorconfig diff --git a/generator/metricbeat/{beat}/.gitignore b/generator/_templates/metricbeat/{beat}/.gitignore similarity index 100% rename from generator/metricbeat/{beat}/.gitignore rename to generator/_templates/metricbeat/{beat}/.gitignore diff --git a/generator/metricbeat/{beat}/CONTRIBUTING.md b/generator/_templates/metricbeat/{beat}/CONTRIBUTING.md similarity index 100% rename from generator/metricbeat/{beat}/CONTRIBUTING.md rename to generator/_templates/metricbeat/{beat}/CONTRIBUTING.md diff --git a/generator/metricbeat/{beat}/LICENSE.txt b/generator/_templates/metricbeat/{beat}/LICENSE.txt similarity index 100% rename from generator/metricbeat/{beat}/LICENSE.txt rename to generator/_templates/metricbeat/{beat}/LICENSE.txt diff --git a/generator/metricbeat/{beat}/Makefile b/generator/_templates/metricbeat/{beat}/Makefile similarity index 100% rename from generator/metricbeat/{beat}/Makefile rename to generator/_templates/metricbeat/{beat}/Makefile diff --git a/generator/metricbeat/{beat}/NOTICE.txt b/generator/_templates/metricbeat/{beat}/NOTICE.txt similarity index 100% rename from generator/metricbeat/{beat}/NOTICE.txt rename to generator/_templates/metricbeat/{beat}/NOTICE.txt diff --git a/generator/metricbeat/{beat}/README.md b/generator/_templates/metricbeat/{beat}/README.md similarity index 100% rename from generator/metricbeat/{beat}/README.md rename to generator/_templates/metricbeat/{beat}/README.md diff --git a/generator/metricbeat/{beat}/_meta/docker.yml b/generator/_templates/metricbeat/{beat}/_meta/docker.yml similarity index 100% rename from generator/metricbeat/{beat}/_meta/docker.yml rename to generator/_templates/metricbeat/{beat}/_meta/docker.yml diff --git a/generator/metricbeat/{beat}/_meta/reference.yml b/generator/_templates/metricbeat/{beat}/_meta/reference.yml similarity index 100% rename from generator/metricbeat/{beat}/_meta/reference.yml rename to generator/_templates/metricbeat/{beat}/_meta/reference.yml diff --git a/generator/metricbeat/{beat}/_meta/short.yml b/generator/_templates/metricbeat/{beat}/_meta/short.yml similarity index 100% rename from generator/metricbeat/{beat}/_meta/short.yml rename to generator/_templates/metricbeat/{beat}/_meta/short.yml diff --git a/generator/_templates/metricbeat/{beat}/cmd/modules.go b/generator/_templates/metricbeat/{beat}/cmd/modules.go new file mode 100644 index 000000000000..411a9bdaeff7 --- /dev/null +++ b/generator/_templates/metricbeat/{beat}/cmd/modules.go @@ -0,0 +1,48 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package cmd + +import ( + "strings" + + "github.com/pkg/errors" + + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" +) + +// BuildModulesManager adds support for modules management to a beat +func BuildModulesManager(beat *beat.Beat) (cmd.ModulesManager, error) { + config := beat.BeatConfig + + glob, err := config.String("config.modules.path", -1) + if err != nil { + return nil, errors.Errorf("modules management requires '%s.config.modules.path' setting", Name) + } + + if !strings.HasSuffix(glob, "*.yml") { + return nil, errors.Errorf("wrong settings for config.modules.path, it is expected to end with *.yml. Got: %s", glob) + } + + modulesManager, err := cfgfile.NewGlobManager(glob, ".yml", ".disabled") + if err != nil { + return nil, errors.Wrap(err, "initialization error") + } + return modulesManager, nil +} diff --git a/generator/_templates/metricbeat/{beat}/cmd/root.go b/generator/_templates/metricbeat/{beat}/cmd/root.go new file mode 100644 index 000000000000..840e7b1a7cdc --- /dev/null +++ b/generator/_templates/metricbeat/{beat}/cmd/root.go @@ -0,0 +1,50 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package cmd + +import ( + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/cmd/test" + "github.com/elastic/beats/v7/metricbeat/mb/module" +) + +// Name of this beat +var Name = "{beat}" + +// RootCmd to handle beats cli +var RootCmd *cmd.BeatsRootCmd + +var ( + // Use a customized instance of Metricbeat where startup delay has + // been disabled to workaround the fact that Modules() will return + // the static modules (not the dynamic ones) with a start delay. + testModulesCreator = beater.Creator( + beater.WithModuleOptions( + module.WithMetricSetInfo(), + module.WithMaxStartDelay(0), + ), + ) +) + +func init() { + RootCmd = cmd.GenRootCmdWithSettings(beater.DefaultCreator(), instance.Settings{Name: Name}) + RootCmd.AddCommand(cmd.GenModulesCmd(Name, "", BuildModulesManager)) + RootCmd.TestCmd.AddCommand(test.GenTestModulesCmd(Name, "", testModulesCreator)) +} diff --git a/generator/_templates/metricbeat/{beat}/magefile.go b/generator/_templates/metricbeat/{beat}/magefile.go new file mode 100644 index 000000000000..22b3dcfcc762 --- /dev/null +++ b/generator/_templates/metricbeat/{beat}/magefile.go @@ -0,0 +1,137 @@ +// +build mage + +package main + +import ( + "fmt" + "time" + + "github.com/magefile/mage/mg" + + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/target/build" + "github.com/elastic/beats/v7/dev-tools/mage/target/collectors" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/dev-tools/mage/target/update" + "github.com/elastic/beats/v7/generator/common/beatgen" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" +) + +func init() { + devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) + + devtools.BeatDescription = "One sentence description of the Beat." + devtools.BeatVendor = "{full_name}" +} + +// VendorUpdate updates elastic/beats/v7 in the vendor dir +func VendorUpdate() error { + return beatgen.VendorUpdate() +} + +// CollectAll generates the docs and the fields. +func CollectAll() { + mg.Deps(collectors.CollectDocs, FieldsDocs) +} + +// Package packages the Beat for distribution. +// Use SNAPSHOT=true to build snapshots. +// Use PLATFORMS to control the target platforms. +func Package() { + start := time.Now() + defer func() { fmt.Println("package ran for", time.Since(start)) }() + + devtools.UseCommunityBeatPackaging() + + mg.Deps(update.Update) + mg.Deps(build.CrossBuild, build.CrossBuildGoDaemon) + mg.SerialDeps(devtools.Package, pkg.PackageTest) +} + +// FieldsDocs generates docs/fields.asciidoc containing all fields +// (including x-pack). +func FieldsDocs() error { + inputs := []string{ + devtools.OSSBeatDir("module"), + } + output := devtools.CreateDir("build/fields/fields.all.yml") + if err := devtools.GenerateFieldsYAMLTo(output, inputs...); err != nil { + return err + } + return devtools.Docs.FieldDocs(output) +} + +// Fields generates a fields.yml for the Beat. +func Fields() error { + return devtools.GenerateFieldsYAML("module") +} + +// Config generates both the short/reference/docker configs. +func Config() { + mg.Deps(configYML, metricbeat.GenerateDirModulesD) +} + +func configYML() error { + customDeps := devtools.ConfigFileParams{ + ShortParts: []string{"_meta/short.yml", devtools.LibbeatDir("_meta/config.yml.tmpl")}, + ReferenceParts: []string{"_meta/reference.yml", devtools.LibbeatDir("_meta/config.reference.yml.tmpl")}, + DockerParts: []string{"_meta/docker.yml", devtools.LibbeatDir("_meta/config.docker.yml")}, + ExtraVars: map[string]interface{}{"BeatName": devtools.BeatName}, + } + return devtools.Config(devtools.AllConfigTypes, customDeps, ".") +} + +// Clean cleans all generated files and build artifacts. +func Clean() error { + return devtools.Clean() +} + +// Check formats code, updates generated content, check for common errors, and +// checks for any modified files. +func Check() { + common.Check() +} + +// Fmt formats source code (.go and .py) and adds license headers. +func Fmt() { + common.Fmt() +} + +// Update updates the generated files (aka make update). +func Update() error { + return update.Update() +} + +// Imports generates an include/list.go file containing +// a import statement for each module and dataset. +func Imports() error { + return devtools.GenerateModuleIncludeListGo() +} + +// Test runs all available tests +func Test() { + mg.Deps(unittest.GoUnitTest) +} + +// Build builds the Beat binary. +func Build() error { + return build.Build() +} + +// CrossBuild cross-builds the beat for all target platforms. +func CrossBuild() error { + return build.CrossBuild() +} + +// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon). +func BuildGoDaemon() error { + return build.BuildGoDaemon() +} + +// GolangCrossBuild build the Beat binary inside of the golang-builder. +// Do not use directly, use crossBuild instead. +func GolangCrossBuild() error { + return build.GolangCrossBuild() +} diff --git a/generator/metricbeat/{beat}/main.go b/generator/_templates/metricbeat/{beat}/main.go similarity index 100% rename from generator/metricbeat/{beat}/main.go rename to generator/_templates/metricbeat/{beat}/main.go diff --git a/generator/metricbeat/{beat}/make.bat b/generator/_templates/metricbeat/{beat}/make.bat similarity index 100% rename from generator/metricbeat/{beat}/make.bat rename to generator/_templates/metricbeat/{beat}/make.bat diff --git a/generator/beat/Makefile b/generator/beat/Makefile deleted file mode 100644 index dd1e5be85573..000000000000 --- a/generator/beat/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../common/Makefile diff --git a/generator/beat/{beat}/cmd/root.go b/generator/beat/{beat}/cmd/root.go deleted file mode 100644 index 21cd202d0790..000000000000 --- a/generator/beat/{beat}/cmd/root.go +++ /dev/null @@ -1,14 +0,0 @@ -package cmd - -import ( - "{beat_path}/beater" - - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" -) - -// Name of this beat -var Name = "{beat}" - -// RootCmd to handle beats cli -var RootCmd = cmd.GenRootCmdWithSettings(beater.New, instance.Settings{Name: Name}) diff --git a/generator/beat/{beat}/magefile.go b/generator/beat/{beat}/magefile.go deleted file mode 100644 index d8f7bbe85607..000000000000 --- a/generator/beat/{beat}/magefile.go +++ /dev/null @@ -1,101 +0,0 @@ -// +build mage - -package main - -import ( - "fmt" - "time" - - "github.com/magefile/mage/mg" - "github.com/magefile/mage/sh" - - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/pkg" - "github.com/elastic/beats/dev-tools/mage/target/unittest" - "github.com/elastic/beats/generator/common/beatgen" -) - -func init() { - devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) - - devtools.BeatDescription = "One sentence description of the Beat." - devtools.BeatVendor = "{full_name}" -} - -// VendorUpdate updates elastic/beats in the vendor dir -func VendorUpdate() error { - return beatgen.VendorUpdate() -} - -// Package packages the Beat for distribution. -// Use SNAPSHOT=true to build snapshots. -// Use PLATFORMS to control the target platforms. -func Package() { - start := time.Now() - defer func() { fmt.Println("package ran for", time.Since(start)) }() - - devtools.UseCommunityBeatPackaging() - - mg.Deps(Update) - mg.Deps(build.CrossBuild, build.CrossBuildGoDaemon) - mg.SerialDeps(devtools.Package, pkg.PackageTest) -} - -// Update updates the generated files (aka make update). -func Update() error { - return sh.Run("make", "update") -} - -// Fields generates a fields.yml for the Beat. -func Fields() error { - return devtools.GenerateFieldsYAML() -} - -// Config generates both the short/reference/docker configs. -func Config() error { - return devtools.Config(devtools.AllConfigTypes, devtools.ConfigFileParams{}, ".") -} - -// Clean cleans all generated files and build artifacts. -func Clean() error { - return devtools.Clean() -} - -// Check formats code, updates generated content, check for common errors, and -// checks for any modified files. -func Check() { - common.Check() -} - -// Fmt formats source code (.go and .py) and adds license headers. -func Fmt() { - common.Fmt() -} - -// Test runs all available tests -func Test() { - mg.Deps(unittest.GoUnitTest) -} - -// Build builds the Beat binary. -func Build() error { - return build.Build() -} - -// CrossBuild cross-builds the beat for all target platforms. -func CrossBuild() error { - return build.CrossBuild() -} - -// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon). -func BuildGoDaemon() error { - return build.BuildGoDaemon() -} - -// GolangCrossBuild build the Beat binary inside of the golang-builder. -// Do not use directly, use crossBuild instead. -func GolangCrossBuild() error { - return build.GolangCrossBuild() -} diff --git a/generator/common/beatgen/beatgen.go b/generator/common/beatgen/beatgen.go index 62e7c36427d4..cd1d1900e883 100644 --- a/generator/common/beatgen/beatgen.go +++ b/generator/common/beatgen/beatgen.go @@ -29,8 +29,8 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/generator/common/beatgen/setup" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/generator/common/beatgen/setup" ) // ConfigItem represents a value that must be configured for the custom beat diff --git a/generator/common/beatgen/setup/creator.go b/generator/common/beatgen/setup/creator.go index 6685ed938e23..8656bf5a5f1f 100644 --- a/generator/common/beatgen/setup/creator.go +++ b/generator/common/beatgen/setup/creator.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // CfgPrefix specifies the env variable prefix used to configure the beat diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index 16987a2e55ad..b0bb5427e22d 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -25,7 +25,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // RunSetup runs any remaining setup commands after the vendor directory has been setup diff --git a/generator/metricbeat/Makefile b/generator/metricbeat/Makefile deleted file mode 100644 index c773d75926c1..000000000000 --- a/generator/metricbeat/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -BEAT_TYPE = metricbeat - -include ../common/Makefile - -# Collects all dependencies and then calls update -.PHONY: collect -collect: diff --git a/generator/metricbeat/{beat}/cmd/modules.go b/generator/metricbeat/{beat}/cmd/modules.go deleted file mode 100644 index 84809354f3ef..000000000000 --- a/generator/metricbeat/{beat}/cmd/modules.go +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package cmd - -import ( - "strings" - - "github.com/pkg/errors" - - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" -) - -// BuildModulesManager adds support for modules management to a beat -func BuildModulesManager(beat *beat.Beat) (cmd.ModulesManager, error) { - config := beat.BeatConfig - - glob, err := config.String("config.modules.path", -1) - if err != nil { - return nil, errors.Errorf("modules management requires '%s.config.modules.path' setting", Name) - } - - if !strings.HasSuffix(glob, "*.yml") { - return nil, errors.Errorf("wrong settings for config.modules.path, it is expected to end with *.yml. Got: %s", glob) - } - - modulesManager, err := cfgfile.NewGlobManager(glob, ".yml", ".disabled") - if err != nil { - return nil, errors.Wrap(err, "initialization error") - } - return modulesManager, nil -} diff --git a/generator/metricbeat/{beat}/cmd/root.go b/generator/metricbeat/{beat}/cmd/root.go deleted file mode 100644 index 94de89a11048..000000000000 --- a/generator/metricbeat/{beat}/cmd/root.go +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package cmd - -import ( - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/cmd/test" - "github.com/elastic/beats/metricbeat/mb/module" -) - -// Name of this beat -var Name = "{beat}" - -// RootCmd to handle beats cli -var RootCmd *cmd.BeatsRootCmd - -var ( - // Use a customized instance of Metricbeat where startup delay has - // been disabled to workaround the fact that Modules() will return - // the static modules (not the dynamic ones) with a start delay. - testModulesCreator = beater.Creator( - beater.WithModuleOptions( - module.WithMetricSetInfo(), - module.WithMaxStartDelay(0), - ), - ) -) - -func init() { - RootCmd = cmd.GenRootCmdWithSettings(beater.DefaultCreator(), instance.Settings{Name: Name}) - RootCmd.AddCommand(cmd.GenModulesCmd(Name, "", BuildModulesManager)) - RootCmd.TestCmd.AddCommand(test.GenTestModulesCmd(Name, "", testModulesCreator)) -} diff --git a/generator/metricbeat/{beat}/magefile.go b/generator/metricbeat/{beat}/magefile.go deleted file mode 100644 index eada92dcd4cd..000000000000 --- a/generator/metricbeat/{beat}/magefile.go +++ /dev/null @@ -1,137 +0,0 @@ -// +build mage - -package main - -import ( - "fmt" - "time" - - "github.com/magefile/mage/mg" - - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/collectors" - "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/pkg" - "github.com/elastic/beats/dev-tools/mage/target/unittest" - "github.com/elastic/beats/dev-tools/mage/target/update" - "github.com/elastic/beats/generator/common/beatgen" - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" -) - -func init() { - devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) - - devtools.BeatDescription = "One sentence description of the Beat." - devtools.BeatVendor = "{full_name}" -} - -// VendorUpdate updates elastic/beats in the vendor dir -func VendorUpdate() error { - return beatgen.VendorUpdate() -} - -// CollectAll generates the docs and the fields. -func CollectAll() { - mg.Deps(collectors.CollectDocs, FieldsDocs) -} - -// Package packages the Beat for distribution. -// Use SNAPSHOT=true to build snapshots. -// Use PLATFORMS to control the target platforms. -func Package() { - start := time.Now() - defer func() { fmt.Println("package ran for", time.Since(start)) }() - - devtools.UseCommunityBeatPackaging() - - mg.Deps(update.Update) - mg.Deps(build.CrossBuild, build.CrossBuildGoDaemon) - mg.SerialDeps(devtools.Package, pkg.PackageTest) -} - -// FieldsDocs generates docs/fields.asciidoc containing all fields -// (including x-pack). -func FieldsDocs() error { - inputs := []string{ - devtools.OSSBeatDir("module"), - } - output := devtools.CreateDir("build/fields/fields.all.yml") - if err := devtools.GenerateFieldsYAMLTo(output, inputs...); err != nil { - return err - } - return devtools.Docs.FieldDocs(output) -} - -// Fields generates a fields.yml for the Beat. -func Fields() error { - return devtools.GenerateFieldsYAML("module") -} - -// Config generates both the short/reference/docker configs. -func Config() { - mg.Deps(configYML, metricbeat.GenerateDirModulesD) -} - -func configYML() error { - customDeps := devtools.ConfigFileParams{ - ShortParts: []string{"_meta/short.yml", devtools.LibbeatDir("_meta/config.yml.tmpl")}, - ReferenceParts: []string{"_meta/reference.yml", devtools.LibbeatDir("_meta/config.reference.yml.tmpl")}, - DockerParts: []string{"_meta/docker.yml", devtools.LibbeatDir("_meta/config.docker.yml")}, - ExtraVars: map[string]interface{}{"BeatName": devtools.BeatName}, - } - return devtools.Config(devtools.AllConfigTypes, customDeps, ".") -} - -// Clean cleans all generated files and build artifacts. -func Clean() error { - return devtools.Clean() -} - -// Check formats code, updates generated content, check for common errors, and -// checks for any modified files. -func Check() { - common.Check() -} - -// Fmt formats source code (.go and .py) and adds license headers. -func Fmt() { - common.Fmt() -} - -// Update updates the generated files (aka make update). -func Update() error { - return update.Update() -} - -// Imports generates an include/list.go file containing -// a import statement for each module and dataset. -func Imports() error { - return devtools.GenerateModuleIncludeListGo() -} - -// Test runs all available tests -func Test() { - mg.Deps(unittest.GoUnitTest) -} - -// Build builds the Beat binary. -func Build() error { - return build.Build() -} - -// CrossBuild cross-builds the beat for all target platforms. -func CrossBuild() error { - return build.CrossBuild() -} - -// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon). -func BuildGoDaemon() error { - return build.BuildGoDaemon() -} - -// GolangCrossBuild build the Beat binary inside of the golang-builder. -// Do not use directly, use crossBuild instead. -func GolangCrossBuild() error { - return build.GolangCrossBuild() -} diff --git a/go.mod b/go.mod new file mode 100644 index 000000000000..eb38c3a88d10 --- /dev/null +++ b/go.mod @@ -0,0 +1,171 @@ +module github.com/elastic/beats/v7 + +go 1.13 + +require ( + 4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b + cloud.google.com/go v0.51.0 + cloud.google.com/go/pubsub v1.0.1 + cloud.google.com/go/storage v1.0.0 + code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee // indirect + code.cloudfoundry.org/go-loggregator v7.4.0+incompatible + code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect + github.com/Azure/azure-event-hubs-go/v3 v3.1.0 + github.com/Azure/azure-sdk-for-go v37.1.0+incompatible + github.com/Azure/azure-storage-blob-go v0.8.0 + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/Azure/go-autorest/autorest v0.9.4 + github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 + github.com/Azure/go-autorest/autorest/date v0.2.0 + github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 + github.com/Shopify/sarama v0.0.0-00010101000000-000000000000 + github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6 + github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc + github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43 + github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 + github.com/aws/aws-lambda-go v1.6.0 + github.com/aws/aws-sdk-go-v2 v0.9.0 + github.com/awslabs/goformation/v4 v4.1.0 + github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 + github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible + github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect + github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e + github.com/cespare/xxhash/v2 v2.1.1 + github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f + github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 + github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c + github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98 + github.com/coreos/go-systemd/v22 v22.0.0 + github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea + github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 // indirect + github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f + github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 // indirect + github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible // indirect + github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1 + github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf // indirect + github.com/docker/docker v1.4.2-0.20170802015333-8af4db6f002a + github.com/docker/go-connections v0.4.0 + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/go-plugins-helpers v0.0.0-20181025120712-1e6269c305b8 + github.com/docker/go-units v0.4.0 + github.com/dop251/goja v0.0.0-00010101000000-000000000000 + github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 + github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 + github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 + github.com/elastic/ecs v1.4.0 + github.com/elastic/go-libaudit v0.4.0 + github.com/elastic/go-licenser v0.2.1 + github.com/elastic/go-lookslike v0.3.0 + github.com/elastic/go-lumber v0.1.0 + github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 + github.com/elastic/go-seccomp-bpf v1.1.0 + github.com/elastic/go-structform v0.0.6 + github.com/elastic/go-sysinfo v1.3.0 + github.com/elastic/go-txfile v0.0.7 + github.com/elastic/go-ucfg v0.8.3 + github.com/elastic/go-windows v1.0.1 // indirect + github.com/elastic/gosigar v0.10.5 + github.com/fatih/color v1.5.0 + github.com/fsnotify/fsevents v0.0.0-00010101000000-000000000000 + github.com/fsnotify/fsnotify v1.4.7 + github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24 + github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647 // indirect + github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect + github.com/go-sql-driver/mysql v1.4.1 + github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be + github.com/godror/godror v0.10.4 + github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b + github.com/gofrs/uuid v3.2.0+incompatible + github.com/gogo/protobuf v1.3.1 + github.com/golang/protobuf v1.3.2 + github.com/golang/snappy v0.0.1 + github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9 + github.com/google/gopacket v1.1.18-0.20191009163724-0ad7f2610e34 + github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f // indirect + github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985 // indirect + github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a + github.com/gorilla/mux v1.7.2 // indirect + github.com/gorilla/websocket v1.4.1 // indirect + github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d // indirect + github.com/insomniacslk/dhcp v0.0.0-20180716145214-633285ba52b2 + github.com/jcmturner/gofork v1.0.0 // indirect + github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 + github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 + github.com/jpillora/backoff v1.0.0 // indirect + github.com/jstemmer/go-junit-report v0.9.1 + github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01 + github.com/magefile/mage v1.9.0 + github.com/mailru/easyjson v0.7.1 // indirect + github.com/mattn/go-colorable v0.0.8 + github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe // indirect + github.com/mattn/go-isatty v0.0.2 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/miekg/dns v1.1.15 + github.com/mitchellh/gox v1.0.1 + github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51 + github.com/mitchellh/mapstructure v1.1.2 + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483 // indirect + github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect + github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338 + github.com/pkg/errors v0.9.1 + github.com/pmezard/go-difflib v1.0.0 + github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc // indirect + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 + github.com/prometheus/common v0.7.0 + github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f + github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a + github.com/reviewdog/reviewdog v0.9.17 + github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e // indirect + github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54 + github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 // indirect + github.com/shirou/gopsutil v2.19.11+incompatible + github.com/spf13/cobra v0.0.3 + github.com/spf13/pflag v1.0.3 + github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983 // indirect + github.com/stretchr/testify v1.4.0 + github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b + github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a + github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b // indirect + github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41 + github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7 // indirect + go.uber.org/atomic v1.3.1 + go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04 + go.uber.org/zap v1.7.1 + golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f + golang.org/x/net v0.0.0-20200202094626-16171245cfb2 + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c + golang.org/x/text v0.3.2 + golang.org/x/time v0.0.0-20191024005414-555d28b269f0 + golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 + google.golang.org/api v0.15.0 + google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb + gopkg.in/inf.v0 v0.9.0 + gopkg.in/jcmturner/gokrb5.v7 v7.3.0 // indirect + gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 + gopkg.in/yaml.v2 v2.2.7 + howett.net/plist v0.0.0-20181124034731-591f970eefbb + k8s.io/api v0.0.0-20190722141453-b90922c02518 + k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8 + k8s.io/client-go v0.0.0-20190620085101-78d2af792bab + k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09 // indirect + k8s.io/utils v0.0.0-20190712204705-3dccf664f023 // indirect + sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f // indirect +) + +replace ( + github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible + github.com/Shopify/sarama => github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970 + github.com/docker/docker => github.com/docker/engine v0.0.0-20191113042239-ea84732a7725 + github.com/docker/go-plugins-helpers => github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f + github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 + github.com/fsnotify/fsevents => github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 + github.com/fsnotify/fsnotify => github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d + github.com/insomniacslk/dhcp => github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 // indirect + github.com/tonistiigi/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000000..3758911919c7 --- /dev/null +++ b/go.sum @@ -0,0 +1,876 @@ +4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f h1:oyYjGRBNq1TxAIG8aHqtxlvqUfzdZf+MbcRb/oweNfY= +4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod h1:HxEsUxoVZyRxsZML/S6e2xAuieFMlGO0756ncWx1aXE= +4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b h1:+TO4EgK74+Qo/ilRDiF2WpY09Jk9VSJSLe3wEn+dJBw= +4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod h1:SHGqVdL7hd2ZaX2T9uEiOZ/OFAUfCCLURdLPJsd8ZNs= +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +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 v0.51.0 h1:PvKAVQWCtlGUSlZkGW3QLelKaWq7KYv/MW1EboG8bfM= +cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= +cloud.google.com/go/bigquery v1.0.1 h1:hL+ycaJpVE9M7nLoiXb/Pn10ENE2u+oddxbD8uu0ZVU= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/pubsub v1.0.1 h1:W9tAK3E57P75u0XLLR82LZyw8VpAnhmyTOxW9qzmyj8= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0 h1:VV2nUM3wwLLGh9lSABFgZMjInyUbJeaRSE64WuAIQ+4= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee h1:iAAPf9s7/+BIiGf+RjgcXLm3NoZaLIJsBXJuUa63Lx8= +code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod h1:Jzi+ccHgo/V/PLQUaQ6hnZcC1c4BS790gx21LRRui4g= +code.cloudfoundry.org/go-loggregator v7.4.0+incompatible h1:KqZYloMQWM5Zg/BQKunOIA4OODh7djZbk48qqbowNFI= +code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod h1:KPBTRqj+y738Nhf1+g4JHFaBU8j7dedirR5ETNHvMXU= +code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk= +code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI= +code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a h1:8rqv2w8xEceNwckcF5ONeRt0qBHlh5bnNfFnYTrZbxs= +code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-amqp-common-go/v3 v3.0.0 h1:j9tjcwhypb/jek3raNrwlCIl7iKQYOug7CLpSyBBodc= +github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= +github.com/Azure/azure-event-hubs-go/v3 v3.1.0 h1:j+/WXzke3PTRu5gAgSpWgWJVfpwIyaedIqqgdgkjAe0= +github.com/Azure/azure-event-hubs-go/v3 v3.1.0/go.mod h1:hR40byNJjKkS74+3RhloPQ8sJ8zFQeJ920Uk3oYY0+k= +github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= +github.com/Azure/azure-pipeline-go v0.1.9/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= +github.com/Azure/azure-pipeline-go v0.2.1 h1:OLBdZJ3yvOn2MezlWvbrBMTEUQC72zAftRZOMdj5HYo= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-sdk-for-go v37.1.0+incompatible h1:aFlw3lP7ZHQi4m1kWCpcwYtczhDkGhDoRaMTaxcOf68= +github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-storage-blob-go v0.6.0/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y= +github.com/Azure/azure-storage-blob-go v0.8.0 h1:53qhf0Oxa0nOjgbDeeYPUeyiNmafAFEY95rZLK0Tj6o= +github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= +github.com/Azure/go-amqp v0.12.6 h1:34yItuwhA/nusvq2sPSNPQxZLCf/CtaogYH8n578mnY= +github.com/Azure/go-amqp v0.12.6/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v12.2.0+incompatible h1:2Fxszbg492oAJrcvJlgyVaTqnQYRkxmEK6VPCLLVpBI= +github.com/Azure/go-autorest v12.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.9.3 h1:OZEIaBbMdUE/Js+BQKlpO81XlISgipr6yDJ+PSwsgi4= +github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= +github.com/Azure/go-autorest/autorest v0.9.4 h1:1cM+NmKw91+8h5vfjgzK4ZGLuN72k87XVZBWyGwNjUM= +github.com/Azure/go-autorest/autorest v0.9.4/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/adal v0.8.1 h1:pZdL8o72rK+avFWl+p9nE8RWi1JInZrWJYlnpfXJwHk= +github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 h1:iM6UAvjR97ZIeR93qTcwpKNMpV+/FTWjwEbuPD495Tk= +github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 h1:LXl088ZQlP0SBppGFsRZonW6hSvwgL5gRByMbvUbx8U= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/autorest/to v0.3.0 h1:zebkZaadz7+wIQYgC7GXaz3Wb28yKYfVkkBKwc38VF8= +github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.2.0 h1:15vMO4y76dehZSq7pAaOLQxC6dZYsSrj2GQpflyM/L4= +github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +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/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg= +github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6 h1:2Gl9Tray0NEjP9KC0FjdGWlszbmTIsBP3JYzgyFdL4E= +github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d h1:g0M6kedfjDpyAAuxqBvJzMNjFzlrQ7Av6LCDFqWierk= +github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod h1:VykaKG/ofkKje+MSvqjrDsz1wfyHIvEVFljhq2EOZ4g= +github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc h1:9iW/Fbn/R/nyUOiqo6AgwBe8uirqUIoTGF3vKG8qjoc= +github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 h1:7rj9qZ63knnVo2ZeepYHvHuRdG76f3tRUTdIQDzRBeI= +github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod h1:cI59GRkC2FRaFYtgbYEqMlgnnfvAwXzjojyZKXwklNg= +github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43 h1:WFwa9pqou0Nb4DdfBOyaBTH0GqLE74Qwdf61E7ITHwQ= +github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod h1:tJPYQG4mnMeUtQvQKNkbsFrnmZOg59Qnf8CcctFv5v4= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/aws/aws-lambda-go v1.6.0 h1:T+u/g79zPKw1oJM7xYhvpq7i4Sjc0iVsXZUaqRVVSOg= +github.com/aws/aws-lambda-go v1.6.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= +github.com/aws/aws-sdk-go-v2 v0.9.0 h1:dWtJKGRFv3UZkMBQaIzMsF0/y4ge3iQPWTzeC4r/vl4= +github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod h1:sa1GePZ/LfBGI4dSq30f6uR4Tthll8axxtEPvlpXZ8U= +github.com/awslabs/goformation/v3 v3.1.0/go.mod h1:hQ5RXo3GNm2laHWKizDzU5DsDy+yNcenSca2UxN0850= +github.com/awslabs/goformation/v4 v4.1.0 h1:JRxIW0IjhYpYDrIZOTJGMu2azXKI+OK5dP56ubpywGU= +github.com/awslabs/goformation/v4 v4.1.0/go.mod h1:MBDN7u1lMNDoehbFuO4uPvgwPeolTMA2TzX1yO6KlxI= +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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDbMh/lWRhRByN0VFLvv+g+ayx1SI= +github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= +github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bradleyfalzon/ghinstallation v1.1.0 h1:mwazVinJU0mPyLxIcdtJzu4DhWXFO5lMsWhKyFRIwFk= +github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod h1:p7iD8KytOOKg2wCqbwvJlq4JGpYMjwjkiqdyUqOIHLI= +github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible h1:4g18+HnTDwEtO0n7K8B1Kjq+04MEKJRkhJNQ/hb9d5A= +github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= +github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e h1:YYUjy5BRwO5zPtfk+aa2gw255FIIoi93zMmuy19o0bc= +github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod h1:V284PjgVwSk4ETmz84rpu9ehpGg7swlIH8npP9k2bGw= +github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e h1:Gbx+iVCXG/1m5WSnidDGuHgN+vbIwl+6fR092ANU+Y8= +github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod h1:AZIh1CCnMrcVm6afFf96PBvE2MRpWFco91z8ObJtgDY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f h1:fK3ikA1s77arBhpDwFuyO0hUZ2Aa8O6o2Uzy8Q6iLbs= +github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod h1:RtIewdO+K/czvxvIFCMbPyx7jdxSLL1RZ+DA/Vk8Lwg= +github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI= +github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= +github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.3 h1:LoIzb5y9x5l8VKAlyrbusNPXqBY0+kviRloxFUMFwKc= +github.com/containerd/containerd v1.3.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 h1:kIFnQBO7rQ0XkMe6xEwbybYHBEaWmh/f++laI6Emt7M= +github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= +github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c h1:KFbqHhDeaHM7IfFtXHfUHMDaUStpM2YwBR+iJCIOsKk= +github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98 h1:oWP4KxUD7aOeKajtnU4/gqkJOTze6zHP6z/aTmI94/4= +github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= +github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea h1:n2Ltr3SrfQlf/9nOna1DoGKxLx3qTSI8Ttl6Xrqp6mw= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 h1:qg9VbHo1TlL0KDM0vYvBG9EY0X0Yku5WYIPoFWt8f6o= +github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE= +github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f h1:WH0w/R4Yoey+04HhFxqZ6VX6I0d7RMyw5aXQ9UTvQPs= +github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= +github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 h1:6+hM8KeYKV0Z9EIINNqIEDyyIRAcNc2FW+/TUYNmWyw= +github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible h1:4jGdduO4ceTJFKf0IhgaB8NJapGqKHwC2b4xQ/cXujM= +github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1 h1:eG5K5GNAAHvQlFmfIuy0Ocjg5dvyX22g/KknwTpmBko= +github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod h1:PRcPVAAma6zcLpFd4GZrjR/MRpood3TamjKI2m/z/Uw= +github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf h1:uOWCk+L8abzw0BzmnCn7j7VT3g6bv9zW8fkR0yOP0Q4= +github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/engine v0.0.0-20191113042239-ea84732a7725 h1:j0zqmciWFnhB01BT/CyfoXNEONoxerGjkcxM8i6tlXI= +github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 h1:RrkoB0pT3gnjXhL/t10BSP1mcr/0Ldea2uMyuBr2SWk= +github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 h1:DW6WrARxK5J+o8uAKCiACi5wy9EK1UzrsCpGBPsKHAA= +github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= +github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqrj3lotWinO9+jFmeDXIC4gvIQs= +github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY= +github.com/elastic/ecs v1.4.0 h1:BGIUwWJhThRO2IQxzm7ekV9TMUGwZoYyevT5/1xmMf0= +github.com/elastic/ecs v1.4.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4= +github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 h1:cWPqxlPtir4RoQVCpGSRXmLqjEHpJKbR60rxh1nQZY4= +github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod h1:Msl1pdboCbArMF/nSCDUXgQuWTeoMmE/z8607X+k7ng= +github.com/elastic/go-libaudit v0.4.0 h1:pxLCycMJKW91W8ZmZT74DQmryTZuXryKESo6sXdu1XY= +github.com/elastic/go-libaudit v0.4.0/go.mod h1:lNJ7gX+arohEQTwqinAc8xycVuFNqsaunba1mwcBdvE= +github.com/elastic/go-licenser v0.2.1 h1:K76YI6XR2LRpewLGwhrTqasXZcNJG2yHY4/jit/IXGY= +github.com/elastic/go-licenser v0.2.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ= +github.com/elastic/go-lookslike v0.3.0 h1:HDI/DQ65V85ZqM7D/sbxcK2wFFnh3+7iFvBk2v2FTHs= +github.com/elastic/go-lookslike v0.3.0/go.mod h1:AhH+rdJux5RlVjs+6ej4jkvYyoNRkj2crxmqeHlj3hA= +github.com/elastic/go-lumber v0.1.0 h1:HUjpyg36v2HoKtXlEC53EJ3zDFiDRn65d7B8dBHNius= +github.com/elastic/go-lumber v0.1.0/go.mod h1:8YvjMIRYypWuPvpxx7WoijBYdbB7XIh/9FqSYQZTtxQ= +github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 h1:q8n4QjcLa4q39Q3fqHRknTBXBtegjriHFrB42YKgXGI= +github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod h1:s09U1b4P1ZxnKx2OsqY7KlHdCesqZWIhyq0Gs/QC/Us= +github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f h1:FvsqAVIFZtJtK+koSvFU+/KoNQo1m14kgV5qJ8ImN+U= +github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod h1:OPGqFNdTS34kMReS5hPFtBhD9J8itmSDurs1ix2wx7c= +github.com/elastic/go-seccomp-bpf v1.1.0 h1:jUzzDc6LyCtdolZdvL/26dad6rZ9vsc7xZ2eadKECAU= +github.com/elastic/go-seccomp-bpf v1.1.0/go.mod h1:l+89Vy5BzjVcaX8USZRMOwmwwDScE+vxCFzzvQwN7T8= +github.com/elastic/go-structform v0.0.6 h1:wqeK4LwD2NNDOoRGTImE24S6pkCDVr8+oUSIkmChzLk= +github.com/elastic/go-structform v0.0.6/go.mod h1:QrMyP3oM9Sjk92EVGLgRaL2lKt0Qx7ZNDRWDxB6khVs= +github.com/elastic/go-sysinfo v1.3.0 h1:eb2XFGTMlSwG/yyU9Y8jVAYLIzU2sFzWXwo2gmetyrE= +github.com/elastic/go-sysinfo v1.3.0/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= +github.com/elastic/go-txfile v0.0.7 h1:Yn28gclW7X0Qy09nSMSsx0uOAvAGMsp6XHydbiLVe2s= +github.com/elastic/go-txfile v0.0.7/go.mod h1:H0nCoFae0a4ga57apgxFsgmRjevNCsEaT6g56JoeKAE= +github.com/elastic/go-ucfg v0.7.0 h1:1+C/sZdJKww8hKl7XtLPTjs4cFslhQF2fazKTF+ZE+4= +github.com/elastic/go-ucfg v0.7.0/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo= +github.com/elastic/go-ucfg v0.8.3 h1:leywnFjzr2QneZZWhE6uWd+QN/UpP0sdJRHYyuFvkeo= +github.com/elastic/go-ucfg v0.8.3/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo= +github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= +github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= +github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= +github.com/elastic/gosigar v0.10.5 h1:GzPQ+78RaAb4J63unidA/JavQRKrB6s8IOzN6Ib59jo= +github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= +github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970 h1:rSo6gsz4zOanqtJ5fmZYQJvEJnA5YsVOB25casIwqUw= +github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970/go.mod h1:fGP8eQ6PugKEI0iUETYYtnP6d1pH/bdDMTel1X5ajsU= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.5.0 h1:vBh+kQp8lg9XPr56u1CPrWjFXtdphMoGWVHr9/1c+A0= +github.com/fatih/color v1.5.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5GPSg= +github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= +github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24 h1:nREVDi4H8mwnNqfxFU9NMzZrDCg8TXbEatMvHozxKwU= +github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= +github.com/go-kit/kit v0.9.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 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647 h1:whypLownH338a3Ork2w9t0KUKtVxbXYySuz7V1YGsJo= +github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug= +github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be h1:zXHeEEJ231bTf/IXqvCfeaqjLpXsq42ybLoT4ROSR6Y= +github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod h1:/oj50ZdPq/cUjA02lMZhijk5kR31SEydKyqah1OgBuo= +github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8= +github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godror/godror v0.10.4 h1:44FcfzDPp/PJZzen5Hm59SZQBhgrbR6E1KwCjg6gnJo= +github.com/godror/godror v0.10.4/go.mod h1:9MVLtu25FBJBMHkPs0m3Ngf/VmwGcLpM2HS8PlNGw9U= +github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b h1:3QNh5Xo2pmr2nZXENtnztfpjej8XY8EPmvYxF5SzY9M= +github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +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/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/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 v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +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 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +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/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9 h1:b4EyQBj8pgtcWOr7YCSxK6NUQzJr0n4hxJ3mc+dtKk4= +github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +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/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo= +github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= +github.com/google/go-github/v29 v29.0.2 h1:opYN6Wc7DOz7Ku3Oh4l7prmkOMwEcQxpFtxdU8N8Pts= +github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gopacket v1.1.18-0.20191009163724-0ad7f2610e34 h1:/wV+gZsAEt7vP+fJkT1AltOejfLS3uonB4RTOdXWjVk= +github.com/google/gopacket v1.1.18-0.20191009163724-0ad7f2610e34/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +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/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f h1:XXzyYlFbxK3kWfcmu3Wc+Tv8/QQl/VqwsWuSYF1Rj0s= +github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985 h1:bCrkbuMwrQnnTsa9Y0giRda4P3fvay8f98tvYmZXVhg= +github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a h1:yNuTIQkXLNAevCwQJ7ur3ZPoZPhbvAi6QXhJ/ylX6+8= +github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= +github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I= +github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= +github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= +github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +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/golang-lru v0.5.2-0.20190520140433-59383c442f7d h1:Ft6PtvobE9vwkCsuoNO5DZDbhKkKuktAlSsiOi1X5NA= +github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01 h1:HiJF8Mek+I7PY0Bm+SuhkwaAZSZP83sw6rrTMrgZ0io= +github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod h1:1DWDZmeYf0LX30zscWb7K9rUMeirNeBMd5Dum+seUhc= +github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod h1:RsN5RGgVYeXpcXNtWyztD5VIe7VNSEqpJvF2iEH7QvI= +github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod h1:FGO/dXIFZnan7KvvUSFk1hYMnoVNzB6NTMPrmke8SSI= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= +github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 h1:lrdPtrORjGv1HbbEvKWDUAy97mPpFm4B8hp77tcCUJY= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +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/justinas/nosurf v1.1.0/go.mod h1:ALpWdSbuNGy2lZWtyXdjkYv4edL23oSEgfBT1gPJ5BQ= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd h1:eTGTdO1ZbZ0HSC6TxDLtBl7W0fgFpGlbdPBK+IF0I0g= +github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= +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/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01 h1:EPw7R3OAyxHBCyl0oqh3lUZqS5lu3KSxzzGasE0opXQ= +github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE= +github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a h1:TpvdAwDAt1K4ANVOfcihouRdvP+MgAfDWwBuct4l6ZY= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8= +github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11 h1:YFh+sjyJTMQSYjKwM4dFKhJPJC/wfo98tPUc17HdoYw= +github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod h1:Ah2dBMoxZEqk118as2T4u4fjfXarE0pPnMJaArZQZsI= +github.com/mattn/go-colorable v0.0.8 h1:KatiXbcoFpoKmM5pL0yhug+tx/POfZO+0aVsuGhUhgo= +github.com/mattn/go-colorable v0.0.8/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe h1:YioO2TiJyAHWHyCRQCP8jk5IzTqmsbGc5qQPIhHo6xs= +github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= +github.com/mattn/go-isatty v0.0.2 h1:F+DnWktyadxnOrohKLNUC9/GjFii5RJgY4GFG6ilggw= +github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-shellwords v1.0.7 h1:KqhVjVZomx2puPACkj9vrGFqnp42Htvo9SEAWePHKOs= +github.com/mattn/go-shellwords v1.0.7/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.1.15 h1:CSSIDtllwGLMoA6zjdKnaE6Tx6eVUxQ29LUgGetiDCI= +github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= +github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= +github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51 h1:qdHlMllk/PTLUrX3XdtXDrLL1lPSfcqUmJD1eYfbapg= +github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= +github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.5.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.2.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483 h1:eFd3FsB01m/zNg/yBMYdm/XqiqCztcN9SVRPtGtzDHo= +github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU= +github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc9 h1:/k06BMULKF5hidyoZymkoDCzdJzltZpz/UU4LguQVtc= +github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= +github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2 h1:CXwSGu/LYmbjEab5aMCs5usQRVBGThelUKBNnoSOuso= +github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pierrec/lz4 v2.2.6+incompatible h1:6aCX4/YZ9v8q69hTyiR7dNLnTA3fgtKHVVW5BCd5Znw= +github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338 h1:/VAZ3an4jHXs+61iNHugNR1mG25MSpaxtMnwOJVEAQM= +github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod h1:4xpMLz7RBWyB+ElzHu8Llua96TRCB3YwX+l5EP1wmHk= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc h1:6B8wpniGN4FtqzqWhe2OBOGkeZFbhwZpCh+V/pv/oik= +github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod h1:ikMPikHu8SMvBGWoKulvvOOZN227amf2E9eMYqyAwAY= +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/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f h1:i2BUTcG1g7lSgF/xVL4BJBAdrtNp4zL8woVTGHpEG4g= +github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rakyll/statik v0.1.6/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd h1:fvaEkjpr2NJbtnFRCft7D6y/mQ5/2OQU0pKJLW8dwFA= +github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod h1:giYAXnpegRDPsXUO7TRpDKXJo1lFGYxyWRfEt5iQ+OA= +github.com/reviewdog/reviewdog v0.9.17 h1:MKb3rlQZgkEXr3d85iqtYNITXn7gDJr2kT0IhgX/X9A= +github.com/reviewdog/reviewdog v0.9.17/go.mod h1:Y0yPFDTi9L5ohkoecJdgbvAhq+dUXp+zI7atqVibwKg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e h1:hUGyBE/4CXRPThr4b6kt+f1CN90no4Fs5CNrYOKYSIg= +github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod h1:Sb6li54lXV0yYEjI4wX8cucdQ9gqUJV3+Ngg3l9g30I= +github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54 h1:jbchLJWyhKcmOjkbC4zDvT/n5EEd7g6hnnF760rEyRA= +github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod h1:Vrkh1pnjV9Bl8c3P9zH0/D4NlOHWP5d4/hF4YTULaec= +github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA= +github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY= +github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ= +github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 h1:39BJIaZIhIBmXATIhdlTBlTQpAiGXHnz17CrO7vF2Ss= +github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ= +github.com/shirou/gopsutil v2.19.11+incompatible h1:lJHR0foqAjI4exXqWsU3DbH7bX1xvdhGdnXTIARA9W4= +github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +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 v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +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/objx v0.1.2-0.20180702103455-b8b73a35e983 h1:4s04gnPlcop3dmAHjOAHWa6gX7Dg7h0gh81gr3GwzIk= +github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +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/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b h1:X/8hkb4rQq3+QuOxpJK7gWmAXmZucF0EI1s1BfBLq6U= +github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod h1:jAqhj/JBVC1PwcLTWd6rjQyGyItxxrhpiBl8LSuAGmw= +github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a h1:vVmCas8T0lbxAI1GuQO45L0o/OrWJSXtiK6vH27Qspg= +github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod h1:RIkfovP3Y7my19aXEjjbNd9E5TlHozzAyt7B8AaEcwg= +github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e h1:NiofbjIUI5gR+ybDsGSVH1fWyjSeDYiYVJHT1+kcsak= +github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod h1:6GfHrdWBQYjFRIznu7XuQH4lYB2w8nO4bnImVKkzPOM= +github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod h1:DFxTNgS/ExCGmmjVjSOgS2WjtfjKXgCyDzAFgbtovSA= +github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b h1:eRYRTx+2CteM4P2U+VgAeAmuMAyB/QAGxWtgH7/o4l8= +github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b/go.mod h1:DFxTNgS/ExCGmmjVjSOgS2WjtfjKXgCyDzAFgbtovSA= +github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4 h1:hhA8EBThzz9PztawVTycKvfETVuBqxAQ5keFlAVtbAw= +github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod h1:RspW+E2Yb7Fs7HclB2tiDaiu6Rp41BiIG4Wo1YaoXGc= +github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g= +github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41 h1:NeNpIvfvaFOh0BH7nMEljE5Rk/VJlxhm58M41SeOD20= +github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/xanzy/go-gitlab v0.22.3 h1:/rNlZ2hquUWNc6rJdntVM03tEOoTmnZ1lcNyJCl0WlU= +github.com/xanzy/go-gitlab v0.22.3/go.mod h1:t4Bmvnxj7k37S4Y17lfLx+nLqkf/oQwT2HagfWKv5Og= +github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= +github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= +github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= +github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56 h1:yhqBHs09SmmUoNOHc9jgK4a60T3XFRtPAkYxVnqgY50= +github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7 h1:0gYLpmzecnaDCoeWxSfEJ7J1b6B/67+NV++4HKQXx+Y= +github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.3.1 h1:U8WaWEmp56LGz7PReduqHRVF6zzs9GbMC2NEZ42dxSQ= +go.uber.org/atomic v1.3.1/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04 h1:8sYuFs2lovgFwQi15/wIkCkGX9sL8RouzbWUmBjTcXk= +go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.7.1 h1:wKPciimwkIgV4Aag/wpSDzvtO5JrfwdHKHO7blTHx7Q= +go.uber.org/zap v1.7.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/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-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +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-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +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-20191227195350-da58074b4299 h1:zQpM52jfKHG6II1ISZY1ZcpygvuSFZpLwfluuF89XOg= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +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-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +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.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181108082009-03003ca0c849/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/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-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/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-20180909124046-d0be0721c37e/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-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/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-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c h1:OYFUffxXPezb7BVTx9AaD4Vl0qtxmklBIkwCKH1YwDY= +golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +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.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +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/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190524140312-2c0ae7006135/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-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 h1:Toz2IK7k8rbltAXwNAxKcn9OzqyNfMUhUNjz3sL0NMk= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +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= +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.15.0 h1:yzlyyDW/J0w8yNFJIhiAJy4kq74S+1DOLdawELNxFMA= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +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/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +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-20191230161307-f3c370f40bfb h1:ADPHZzpzM4tk4V4S5cnCrr5SwzvlrPRmqqCuJDB8UTs= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/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= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +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-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/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw= +gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= +gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM= +gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= +gopkg.in/jcmturner/goidentity.v3 v3.0.0 h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI= +gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= +gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= +gopkg.in/jcmturner/gokrb5.v7 v7.3.0 h1:0709Jtq/6QXEuWRfAm260XqlpcwL1vxtO1tUE2qK8Z4= +gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= +gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU= +gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= +gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 h1:/saqWwm73dLmuzbNhe92F0QsZ/KiFND+esHco2v1hiY= +gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +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.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= +howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= +k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A= +k8s.io/api v0.0.0-20190722141453-b90922c02518 h1:mShu41WQl4VJGAd7fbhhH0tsy+KMjZRnC/OcFYF8RVc= +k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod h1:1O0xzX/RAtnm7l+5VEUxZ1ysO2ghatfq/OZED4zM9kA= +k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= +k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8 h1:fVMoqaOPZ6KTeszBSBO8buFmXaR2JlnMn53eEBeganU= +k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod h1:sBJWIJZfxLhp7mRsRyuAE/NfKTr3kXGR1iaqg8O0gJo= +k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g= +k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09 h1:w2hB+DoJsxpuO4hxMXfs44k1riAXX5kaV40564cWMUc= +k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= +k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= +k8s.io/utils v0.0.0-20190712204705-3dccf664f023 h1:1H4Jyzb0z2X0GfBMTwRjnt5ejffRHrGftUgJcV/ZfDc= +k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f h1:rBmJnclilUaQG3K5/iL9zD57jtKRimbK2bJQGqktcs8= +sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod h1:JLeFbgenPHTQHNZeYbMLTT18IylpsFnR2+IHPl6wctA= diff --git a/heartbeat/autodiscover/builder/hints/monitors.go b/heartbeat/autodiscover/builder/hints/monitors.go index bb2a7d16ca70..ba89d81b4563 100644 --- a/heartbeat/autodiscover/builder/hints/monitors.go +++ b/heartbeat/autodiscover/builder/hints/monitors.go @@ -23,12 +23,12 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/heartbeat/autodiscover/builder/hints/monitors_test.go b/heartbeat/autodiscover/builder/hints/monitors_test.go index d3d37f990908..82c4dc6262c8 100644 --- a/heartbeat/autodiscover/builder/hints/monitors_test.go +++ b/heartbeat/autodiscover/builder/hints/monitors_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints(t *testing.T) { diff --git a/heartbeat/autodiscover/include.go b/heartbeat/autodiscover/include.go index cd4bf8bf0b62..2ae869729c49 100644 --- a/heartbeat/autodiscover/include.go +++ b/heartbeat/autodiscover/include.go @@ -19,5 +19,5 @@ package autodiscover import ( // include all heartbeat specific builders - _ "github.com/elastic/beats/heartbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/heartbeat/autodiscover/builder/hints" ) diff --git a/heartbeat/beater/heartbeat.go b/heartbeat/beater/heartbeat.go index 66861a9d94ec..90eef546788f 100644 --- a/heartbeat/beater/heartbeat.go +++ b/heartbeat/beater/heartbeat.go @@ -21,20 +21,20 @@ import ( "fmt" "time" - "github.com/elastic/beats/heartbeat/hbregistry" + "github.com/elastic/beats/v7/heartbeat/hbregistry" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/config" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" + "github.com/elastic/beats/v7/heartbeat/config" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" ) // Heartbeat represents the root datastructure of this beat. diff --git a/heartbeat/cmd/root.go b/heartbeat/cmd/root.go index 80435dbc4b99..858cc2c0daf6 100644 --- a/heartbeat/cmd/root.go +++ b/heartbeat/cmd/root.go @@ -20,14 +20,14 @@ package cmd import ( "fmt" - _ "github.com/elastic/beats/heartbeat/autodiscover" - "github.com/elastic/beats/heartbeat/beater" + _ "github.com/elastic/beats/v7/heartbeat/autodiscover" + "github.com/elastic/beats/v7/heartbeat/beater" // register default heartbeat monitors - _ "github.com/elastic/beats/heartbeat/monitors/defaults" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/publisher/processing" + _ "github.com/elastic/beats/v7/heartbeat/monitors/defaults" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/publisher/processing" ) // Name of this beat diff --git a/heartbeat/config/config.go b/heartbeat/config/config.go index fd23e1e6af78..5e676c191083 100644 --- a/heartbeat/config/config.go +++ b/heartbeat/config/config.go @@ -21,8 +21,8 @@ package config import ( - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" ) // Config defines the structure of heartbeat.yml. diff --git a/heartbeat/eventext/eventext.go b/heartbeat/eventext/eventext.go index 675fe191c910..122c8ae70e2c 100644 --- a/heartbeat/eventext/eventext.go +++ b/heartbeat/eventext/eventext.go @@ -18,8 +18,8 @@ package eventext import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // MergeEventFields merges the given common.MapStr into the given Event's Fields. diff --git a/heartbeat/hbregistry/hbregistry.go b/heartbeat/hbregistry/hbregistry.go index dfd4c799cabc..66b4ad2117c9 100644 --- a/heartbeat/hbregistry/hbregistry.go +++ b/heartbeat/hbregistry/hbregistry.go @@ -17,7 +17,7 @@ package hbregistry -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" // StatsRegistry contains a singleton instance of the heartbeat stats registry var StatsRegistry = monitoring.Default.NewRegistry("heartbeat") diff --git a/heartbeat/hbtest/hbtestutil.go b/heartbeat/hbtest/hbtestutil.go index 05f09d0f1e90..9bec84ee0b59 100644 --- a/heartbeat/hbtest/hbtestutil.go +++ b/heartbeat/hbtest/hbtestutil.go @@ -30,12 +30,12 @@ import ( "strings" "testing" - "github.com/elastic/beats/heartbeat/hbtestllext" + "github.com/elastic/beats/v7/heartbeat/hbtestllext" "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/common/x509util" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/common/x509util" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go index 7b29eac539d8..939dd4872b2a 100644 --- a/heartbeat/include/fields.go +++ b/heartbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/heartbeat/look/look.go b/heartbeat/look/look.go index b22281f64920..d6ea75a395a7 100644 --- a/heartbeat/look/look.go +++ b/heartbeat/look/look.go @@ -22,9 +22,9 @@ package look import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/heartbeat/reason" + "github.com/elastic/beats/v7/heartbeat/reason" ) // RTT formats a round-trip-time given as time.Duration into an diff --git a/heartbeat/look/look_test.go b/heartbeat/look/look_test.go index 558337adfc7f..e5b566ebb574 100644 --- a/heartbeat/look/look_test.go +++ b/heartbeat/look/look_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - reason2 "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" + reason2 "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" ) // helper diff --git a/heartbeat/magefile.go b/heartbeat/magefile.go index 84a38bf5e629..0771f376c4c7 100644 --- a/heartbeat/magefile.go +++ b/heartbeat/magefile.go @@ -27,16 +27,16 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/generator/common/beatgen" - heartbeat "github.com/elastic/beats/heartbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/generator/common/beatgen" + heartbeat "github.com/elastic/beats/v7/heartbeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" ) func init() { @@ -47,7 +47,7 @@ func init() { devtools.BeatServiceName = "heartbeat-elastic" } -// VendorUpdate updates elastic/beats in the vendor dir +// VendorUpdate updates elastic/beats/v7 in the vendor dir func VendorUpdate() error { return beatgen.VendorUpdate() } diff --git a/heartbeat/main.go b/heartbeat/main.go index 009752fd20f3..6218bf004322 100644 --- a/heartbeat/main.go +++ b/heartbeat/main.go @@ -20,9 +20,9 @@ package main import ( "os" - "github.com/elastic/beats/heartbeat/cmd" + "github.com/elastic/beats/v7/heartbeat/cmd" - _ "github.com/elastic/beats/heartbeat/include" + _ "github.com/elastic/beats/v7/heartbeat/include" ) func main() { diff --git a/heartbeat/main_test.go b/heartbeat/main_test.go index 7a10fb838ee9..7de20114fa03 100644 --- a/heartbeat/main_test.go +++ b/heartbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/heartbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/heartbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/heartbeat/monitors/active/dialchain/builder.go b/heartbeat/monitors/active/dialchain/builder.go index 301c932db573..72e74aadc921 100644 --- a/heartbeat/monitors/active/dialchain/builder.go +++ b/heartbeat/monitors/active/dialchain/builder.go @@ -23,11 +23,11 @@ import ( "net/url" "time" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Builder maintains a DialerChain for building dialers and dialer based diff --git a/heartbeat/monitors/active/dialchain/dialchain.go b/heartbeat/monitors/active/dialchain/dialchain.go index 0f0c764e779d..d6d2ea050987 100644 --- a/heartbeat/monitors/active/dialchain/dialchain.go +++ b/heartbeat/monitors/active/dialchain/dialchain.go @@ -18,8 +18,8 @@ package dialchain import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // DialerChain composes builders for multiple network layers, used to build diff --git a/heartbeat/monitors/active/dialchain/net.go b/heartbeat/monitors/active/dialchain/net.go index e31798982b37..01b8b6c49b7e 100644 --- a/heartbeat/monitors/active/dialchain/net.go +++ b/heartbeat/monitors/active/dialchain/net.go @@ -23,12 +23,12 @@ import ( "strconv" "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // TCPDialer creates a new NetDialer with constant event fields and default diff --git a/heartbeat/monitors/active/dialchain/socks5.go b/heartbeat/monitors/active/dialchain/socks5.go index 694b8cd949cd..ce8987a0623c 100644 --- a/heartbeat/monitors/active/dialchain/socks5.go +++ b/heartbeat/monitors/active/dialchain/socks5.go @@ -20,9 +20,9 @@ package dialchain import ( "net" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // SOCKS5Layer configures a SOCKS5 proxy layer in a DialerChain. diff --git a/heartbeat/monitors/active/dialchain/tls.go b/heartbeat/monitors/active/dialchain/tls.go index f7f6de720d37..79ea3aea2597 100644 --- a/heartbeat/monitors/active/dialchain/tls.go +++ b/heartbeat/monitors/active/dialchain/tls.go @@ -24,10 +24,10 @@ import ( "net" "time" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // TLSLayer configures the TLS layer in a DialerChain. diff --git a/heartbeat/monitors/active/dialchain/tls_test.go b/heartbeat/monitors/active/dialchain/tls_test.go index b281bf602e94..8df41fbd3b06 100644 --- a/heartbeat/monitors/active/dialchain/tls_test.go +++ b/heartbeat/monitors/active/dialchain/tls_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func Test_addCertMetdata(t *testing.T) { diff --git a/heartbeat/monitors/active/dialchain/util.go b/heartbeat/monitors/active/dialchain/util.go index f0c8247361a1..fdc6a7843c1b 100644 --- a/heartbeat/monitors/active/dialchain/util.go +++ b/heartbeat/monitors/active/dialchain/util.go @@ -21,8 +21,8 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type timer struct { diff --git a/heartbeat/monitors/active/http/check.go b/heartbeat/monitors/active/http/check.go index 4ff5ab4a4702..327674f7956d 100644 --- a/heartbeat/monitors/active/http/check.go +++ b/heartbeat/monitors/active/http/check.go @@ -27,11 +27,11 @@ import ( pkgerrors "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/jsontransform" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/conditions" ) // multiValidator combines multiple validations of each type into a single easy to use object. diff --git a/heartbeat/monitors/active/http/check_test.go b/heartbeat/monitors/active/http/check_test.go index 3c3e42caa060..14f4fb0c2646 100644 --- a/heartbeat/monitors/active/http/check_test.go +++ b/heartbeat/monitors/active/http/check_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/conditions" ) func TestCheckBody(t *testing.T) { diff --git a/heartbeat/monitors/active/http/config.go b/heartbeat/monitors/active/http/config.go index e195f4209e3e..c648cfecfc92 100644 --- a/heartbeat/monitors/active/http/config.go +++ b/heartbeat/monitors/active/http/config.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/conditions" ) type Config struct { diff --git a/heartbeat/monitors/active/http/http.go b/heartbeat/monitors/active/http/http.go index ef6c43b9c58f..c52b07005af1 100644 --- a/heartbeat/monitors/active/http/http.go +++ b/heartbeat/monitors/active/http/http.go @@ -22,13 +22,13 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func init() { diff --git a/heartbeat/monitors/active/http/http_test.go b/heartbeat/monitors/active/http/http_test.go index bcb372361080..fd3642fbd178 100644 --- a/heartbeat/monitors/active/http/http_test.go +++ b/heartbeat/monitors/active/http/http_test.go @@ -33,14 +33,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - schedule "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/outputs/transport" - btesting "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/heartbeat/hbtest" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + schedule "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + btesting "github.com/elastic/beats/v7/libbeat/testing" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/active/http/respbody.go b/heartbeat/monitors/active/http/respbody.go index b8b95e5b023d..6aee68417f4b 100644 --- a/heartbeat/monitors/active/http/respbody.go +++ b/heartbeat/monitors/active/http/respbody.go @@ -26,8 +26,8 @@ import ( "github.com/docker/go-units" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" ) // maxBufferBodyBytes sets a hard limit on how much we're willing to buffer for any reason internally. diff --git a/heartbeat/monitors/active/http/respbody_test.go b/heartbeat/monitors/active/http/respbody_test.go index 1a3b8accb4ac..071f4e27a47e 100644 --- a/heartbeat/monitors/active/http/respbody_test.go +++ b/heartbeat/monitors/active/http/respbody_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" ) diff --git a/heartbeat/monitors/active/http/simple_transp.go b/heartbeat/monitors/active/http/simple_transp.go index 889baa8e5a1e..56d7fbf3c9ad 100644 --- a/heartbeat/monitors/active/http/simple_transp.go +++ b/heartbeat/monitors/active/http/simple_transp.go @@ -28,7 +28,7 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) const ( diff --git a/heartbeat/monitors/active/http/task.go b/heartbeat/monitors/active/http/task.go index 31fb279fbcdf..3413fe862339 100644 --- a/heartbeat/monitors/active/http/task.go +++ b/heartbeat/monitors/active/http/task.go @@ -29,17 +29,17 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/useragent" - - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/useragent" + + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) var userAgent = useragent.UserAgent("Heartbeat", true) diff --git a/heartbeat/monitors/active/http/task_test.go b/heartbeat/monitors/active/http/task_test.go index 0c9a9d1c6779..01f1f6ac1dac 100644 --- a/heartbeat/monitors/active/http/task_test.go +++ b/heartbeat/monitors/active/http/task_test.go @@ -24,7 +24,7 @@ import ( "reflect" "testing" - "github.com/elastic/beats/libbeat/common/useragent" + "github.com/elastic/beats/v7/libbeat/common/useragent" "github.com/stretchr/testify/require" diff --git a/heartbeat/monitors/active/icmp/config.go b/heartbeat/monitors/active/icmp/config.go index 5ad176d41243..331ff8f45f6c 100644 --- a/heartbeat/monitors/active/icmp/config.go +++ b/heartbeat/monitors/active/icmp/config.go @@ -20,7 +20,7 @@ package icmp import ( "time" - "github.com/elastic/beats/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors" ) type Config struct { diff --git a/heartbeat/monitors/active/icmp/icmp.go b/heartbeat/monitors/active/icmp/icmp.go index be90421fd2f8..66bc0b2adc61 100644 --- a/heartbeat/monitors/active/icmp/icmp.go +++ b/heartbeat/monitors/active/icmp/icmp.go @@ -22,14 +22,14 @@ import ( "net" "net/url" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/heartbeat/monitors/active/tcp/config.go b/heartbeat/monitors/active/tcp/config.go index 749ad1600169..9b6f65fa97b4 100644 --- a/heartbeat/monitors/active/tcp/config.go +++ b/heartbeat/monitors/active/tcp/config.go @@ -21,10 +21,10 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" - "github.com/elastic/beats/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors" ) type Config struct { diff --git a/heartbeat/monitors/active/tcp/task.go b/heartbeat/monitors/active/tcp/task.go index 4c5523f671a5..f583f278aeca 100644 --- a/heartbeat/monitors/active/tcp/task.go +++ b/heartbeat/monitors/active/tcp/task.go @@ -20,12 +20,12 @@ package tcp import ( "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func pingHost( diff --git a/heartbeat/monitors/active/tcp/tcp.go b/heartbeat/monitors/active/tcp/tcp.go index 0fcc4329b9ce..fb547df58dde 100644 --- a/heartbeat/monitors/active/tcp/tcp.go +++ b/heartbeat/monitors/active/tcp/tcp.go @@ -23,14 +23,14 @@ import ( "strconv" "strings" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func init() { diff --git a/heartbeat/monitors/active/tcp/tcp_test.go b/heartbeat/monitors/active/tcp/tcp_test.go index 2f3e915d53fa..7980510f3f8f 100644 --- a/heartbeat/monitors/active/tcp/tcp_test.go +++ b/heartbeat/monitors/active/tcp/tcp_test.go @@ -31,12 +31,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - btesting "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/heartbeat/hbtest" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + btesting "github.com/elastic/beats/v7/libbeat/testing" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/defaults/default.go b/heartbeat/monitors/defaults/default.go index 5e65d46fab3e..610faf5c452f 100644 --- a/heartbeat/monitors/defaults/default.go +++ b/heartbeat/monitors/defaults/default.go @@ -21,7 +21,7 @@ package defaults import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/heartbeat/monitors/active/tcp" + _ "github.com/elastic/beats/v7/heartbeat/monitors/active/http" + _ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp" + _ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp" ) diff --git a/heartbeat/monitors/factory.go b/heartbeat/monitors/factory.go index 6f9391a2fdf6..b6c39d14d4d9 100644 --- a/heartbeat/monitors/factory.go +++ b/heartbeat/monitors/factory.go @@ -18,10 +18,10 @@ package monitors import ( - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" ) // RunnerFactory that can be used to create cfg.Runner cast versions of Monitor diff --git a/heartbeat/monitors/jobs/job.go b/heartbeat/monitors/jobs/job.go index efa387394018..bc41d097f07f 100644 --- a/heartbeat/monitors/jobs/job.go +++ b/heartbeat/monitors/jobs/job.go @@ -18,7 +18,7 @@ package jobs import ( - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) // A Job represents a unit of execution, and may return multiple continuation jobs. diff --git a/heartbeat/monitors/jobs/job_test.go b/heartbeat/monitors/jobs/job_test.go index ffcbc9d6e911..dbb84c324530 100644 --- a/heartbeat/monitors/jobs/job_test.go +++ b/heartbeat/monitors/jobs/job_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" ) diff --git a/heartbeat/monitors/jobs/testing.go b/heartbeat/monitors/jobs/testing.go index c1ba0362d18a..a60b72e28c3e 100644 --- a/heartbeat/monitors/jobs/testing.go +++ b/heartbeat/monitors/jobs/testing.go @@ -20,7 +20,7 @@ package jobs import ( "testing" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) // ExecJobsAndConts recursively executes multiple jobs. diff --git a/heartbeat/monitors/mocks_test.go b/heartbeat/monitors/mocks_test.go index 6fa1793d4f7c..629eeb43a43c 100644 --- a/heartbeat/monitors/mocks_test.go +++ b/heartbeat/monitors/mocks_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/hbtestllext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/hbtest" + "github.com/elastic/beats/v7/heartbeat/hbtestllext" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" diff --git a/heartbeat/monitors/monitor.go b/heartbeat/monitors/monitor.go index 01213f2ad2d1..0326c4094156 100644 --- a/heartbeat/monitors/monitor.go +++ b/heartbeat/monitors/monitor.go @@ -26,13 +26,13 @@ import ( "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/watcher" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/watcher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Monitor represents a configured recurring monitoring configuredJob loaded from a config file. Starting it diff --git a/heartbeat/monitors/monitor_test.go b/heartbeat/monitors/monitor_test.go index 8e19ba52df1f..50553a06e89a 100644 --- a/heartbeat/monitors/monitor_test.go +++ b/heartbeat/monitors/monitor_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler" ) func TestMonitor(t *testing.T) { diff --git a/heartbeat/monitors/plugin.go b/heartbeat/monitors/plugin.go index 68aaa151cd43..a75f8990477e 100644 --- a/heartbeat/monitors/plugin.go +++ b/heartbeat/monitors/plugin.go @@ -23,10 +23,10 @@ import ( "sort" "strings" - "github.com/elastic/beats/heartbeat/hbregistry" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/heartbeat/hbregistry" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/plugin" ) type pluginBuilder struct { diff --git a/heartbeat/monitors/pluginconf.go b/heartbeat/monitors/pluginconf.go index 20aace700fdb..5df2c192cce5 100644 --- a/heartbeat/monitors/pluginconf.go +++ b/heartbeat/monitors/pluginconf.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/common" ) // ErrPluginDisabled is returned when the monitor plugin is marked as disabled. diff --git a/heartbeat/monitors/regrecord.go b/heartbeat/monitors/regrecord.go index b779d68d0e0e..a7c630deaa1a 100644 --- a/heartbeat/monitors/regrecord.go +++ b/heartbeat/monitors/regrecord.go @@ -18,7 +18,7 @@ package monitors import ( - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type registryRecorder interface { diff --git a/heartbeat/monitors/task.go b/heartbeat/monitors/task.go index 148019f5425c..4c045bf6513c 100644 --- a/heartbeat/monitors/task.go +++ b/heartbeat/monitors/task.go @@ -23,14 +23,14 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) // configuredJob represents a job combined with its config and any diff --git a/heartbeat/monitors/task_test.go b/heartbeat/monitors/task_test.go index 6358edd9f352..dc0aa7ab23c4 100644 --- a/heartbeat/monitors/task_test.go +++ b/heartbeat/monitors/task_test.go @@ -28,10 +28,10 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func Test_runPublishJob(t *testing.T) { diff --git a/heartbeat/monitors/util.go b/heartbeat/monitors/util.go index df32a928aef9..8cf2679c0d8b 100644 --- a/heartbeat/monitors/util.go +++ b/heartbeat/monitors/util.go @@ -23,12 +23,12 @@ import ( "net" "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // IPSettings provides common configuration settings for IP resolution and ping diff --git a/heartbeat/monitors/wrappers/monitors.go b/heartbeat/monitors/wrappers/monitors.go index c565d7481c09..5868cdca6364 100644 --- a/heartbeat/monitors/wrappers/monitors.go +++ b/heartbeat/monitors/wrappers/monitors.go @@ -22,18 +22,18 @@ import ( "sync" "time" - "github.com/elastic/beats/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" "github.com/gofrs/uuid" "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // WrapCommon applies the common wrappers that all monitor jobs get. diff --git a/heartbeat/monitors/wrappers/monitors_test.go b/heartbeat/monitors/wrappers/monitors_test.go index 51e17890e495..5cbcb43ebd59 100644 --- a/heartbeat/monitors/wrappers/monitors_test.go +++ b/heartbeat/monitors/wrappers/monitors_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/hbtestllext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/hbtestllext" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/wrappers/util.go b/heartbeat/monitors/wrappers/util.go index 83778069d99e..30afb29c444f 100644 --- a/heartbeat/monitors/wrappers/util.go +++ b/heartbeat/monitors/wrappers/util.go @@ -21,10 +21,10 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // WithFields wraps a Job and all continuations, updating all events returned with the set of diff --git a/heartbeat/monitors/wrappers/util_test.go b/heartbeat/monitors/wrappers/util_test.go index f87b2a9cbd31..a681d4cedad4 100644 --- a/heartbeat/monitors/wrappers/util_test.go +++ b/heartbeat/monitors/wrappers/util_test.go @@ -26,7 +26,7 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestURLFields(t *testing.T) { diff --git a/heartbeat/reason/reason.go b/heartbeat/reason/reason.go index d5fc5e456898..677a87a8971f 100644 --- a/heartbeat/reason/reason.go +++ b/heartbeat/reason/reason.go @@ -17,7 +17,7 @@ package reason -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type Reason interface { error diff --git a/heartbeat/scheduler/schedule/schedule.go b/heartbeat/scheduler/schedule/schedule.go index 696a6b8fa007..51755ae70598 100644 --- a/heartbeat/scheduler/schedule/schedule.go +++ b/heartbeat/scheduler/schedule/schedule.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" ) type Schedule struct { diff --git a/heartbeat/scheduler/schedule/schedule_test.go b/heartbeat/scheduler/schedule/schedule_test.go index 2d0bed8d8362..9665b54d33aa 100644 --- a/heartbeat/scheduler/schedule/schedule_test.go +++ b/heartbeat/scheduler/schedule/schedule_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" ) func TestParse(t *testing.T) { diff --git a/heartbeat/scheduler/scheduler.go b/heartbeat/scheduler/scheduler.go index c104a366c85a..18f927a2d806 100644 --- a/heartbeat/scheduler/scheduler.go +++ b/heartbeat/scheduler/scheduler.go @@ -27,10 +27,10 @@ import ( "golang.org/x/sync/semaphore" - "github.com/elastic/beats/heartbeat/scheduler/timerqueue" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/heartbeat/scheduler/timerqueue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) const ( diff --git a/heartbeat/scheduler/scheduler_test.go b/heartbeat/scheduler/scheduler_test.go index 5ed7e9c95878..6567dab2bebc 100644 --- a/heartbeat/scheduler/scheduler_test.go +++ b/heartbeat/scheduler/scheduler_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - batomic "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/monitoring" + batomic "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // The runAt in the island of tarawa 🏝. Good test TZ because it's pretty rare for a local box diff --git a/heartbeat/scripts/mage/config.go b/heartbeat/scripts/mage/config.go index e3c9ce6752e2..5128c7d6672b 100644 --- a/heartbeat/scripts/mage/config.go +++ b/heartbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // ConfigFileParams returns the default ConfigFileParams for generating diff --git a/heartbeat/watcher/watcher.go b/heartbeat/watcher/watcher.go index d0669127fa0e..cd9866f638e0 100644 --- a/heartbeat/watcher/watcher.go +++ b/heartbeat/watcher/watcher.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type Watch interface { diff --git a/journalbeat/beater/journalbeat.go b/journalbeat/beater/journalbeat.go index 7a54163f832e..a2dcab6d7b63 100644 --- a/journalbeat/beater/journalbeat.go +++ b/journalbeat/beater/journalbeat.go @@ -22,19 +22,19 @@ import ( "sync" "time" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/journalbeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/journalbeat/input" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/journalbeat/config" - _ "github.com/elastic/beats/journalbeat/include" + "github.com/elastic/beats/v7/journalbeat/config" + _ "github.com/elastic/beats/v7/journalbeat/include" // Add dedicated processors - _ "github.com/elastic/beats/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" ) // Journalbeat instance diff --git a/journalbeat/checkpoint/checkpoint.go b/journalbeat/checkpoint/checkpoint.go index ff8e702de1cb..2ba4140182a1 100644 --- a/journalbeat/checkpoint/checkpoint.go +++ b/journalbeat/checkpoint/checkpoint.go @@ -32,8 +32,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) // Checkpoint persists event log state information to disk. diff --git a/journalbeat/cmd/instance/metrics.go b/journalbeat/cmd/instance/metrics.go index 6f2cff63c5a9..7b569da8dd26 100644 --- a/journalbeat/cmd/instance/metrics.go +++ b/journalbeat/cmd/instance/metrics.go @@ -22,9 +22,9 @@ package instance import ( "fmt" - "github.com/coreos/go-systemd/sdjournal" + "github.com/coreos/go-systemd/v22/sdjournal" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/journalbeat/cmd/root.go b/journalbeat/cmd/root.go index a276788d0849..4393f505bb81 100644 --- a/journalbeat/cmd/root.go +++ b/journalbeat/cmd/root.go @@ -18,14 +18,14 @@ package cmd import ( - "github.com/elastic/beats/journalbeat/beater" + "github.com/elastic/beats/v7/journalbeat/beater" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" ) // Name of this beat diff --git a/journalbeat/config/config.go b/journalbeat/config/config.go index 395bf13ec9cb..a5d9127641de 100644 --- a/journalbeat/config/config.go +++ b/journalbeat/config/config.go @@ -23,7 +23,7 @@ package config import ( "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // SeekMode is specifies how a journal is read diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go index 782f09f53f34..45161a4a9fe4 100644 --- a/journalbeat/include/fields.go +++ b/journalbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/journalbeat/input/config.go b/journalbeat/input/config.go index 3916f9ad515b..00eb871cb4c6 100644 --- a/journalbeat/input/config.go +++ b/journalbeat/input/config.go @@ -20,10 +20,10 @@ package input import ( "time" - "github.com/elastic/beats/journalbeat/config" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/journalbeat/config" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" ) // Config stores the options of an input. diff --git a/journalbeat/input/input.go b/journalbeat/input/input.go index b3a74dd46b89..ca39b082049e 100644 --- a/journalbeat/input/input.go +++ b/journalbeat/input/input.go @@ -21,18 +21,18 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" "github.com/gofrs/uuid" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/reader" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/reader" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) // Input manages readers and forwards entries from journals. diff --git a/journalbeat/input/input_test.go b/journalbeat/input/input_test.go index 76e99852c9a3..f80688b786ef 100644 --- a/journalbeat/input/input_test.go +++ b/journalbeat/input/input_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - _ "github.com/elastic/beats/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + _ "github.com/elastic/beats/v7/libbeat/processors/actions" ) func TestProcessorsForInput(t *testing.T) { diff --git a/journalbeat/magefile.go b/journalbeat/magefile.go index 4e3b2c8e5e05..ae30d5983a6d 100644 --- a/journalbeat/magefile.go +++ b/journalbeat/magefile.go @@ -29,14 +29,14 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" ) func init() { diff --git a/journalbeat/main.go b/journalbeat/main.go index 6bfbba776b2d..56c0e645406b 100644 --- a/journalbeat/main.go +++ b/journalbeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/journalbeat/cmd" + "github.com/elastic/beats/v7/journalbeat/cmd" ) func main() { diff --git a/journalbeat/main_test.go b/journalbeat/main_test.go index 7a55116c7f06..63c0e4926046 100644 --- a/journalbeat/main_test.go +++ b/journalbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/journalbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/journalbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/journalbeat/reader/config.go b/journalbeat/reader/config.go index f97390ad0ad6..d9ad57696883 100644 --- a/journalbeat/reader/config.go +++ b/journalbeat/reader/config.go @@ -20,7 +20,7 @@ package reader import ( "time" - "github.com/elastic/beats/journalbeat/config" + "github.com/elastic/beats/v7/journalbeat/config" ) // Config stores the options of a reder. diff --git a/journalbeat/reader/fields.go b/journalbeat/reader/fields.go index 3c06822d98e2..8075e4aee805 100644 --- a/journalbeat/reader/fields.go +++ b/journalbeat/reader/fields.go @@ -19,7 +19,7 @@ package reader -import "github.com/coreos/go-systemd/sdjournal" +import "github.com/coreos/go-systemd/v22/sdjournal" type fieldConversion struct { name string diff --git a/journalbeat/reader/journal.go b/journalbeat/reader/journal.go index a2c9d0e8ce17..9c599d296577 100644 --- a/journalbeat/reader/journal.go +++ b/journalbeat/reader/journal.go @@ -28,16 +28,16 @@ import ( "syscall" "time" - "github.com/coreos/go-systemd/sdjournal" + "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/journalbeat/config" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/journalbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/logp" ) // Reader reads entries from journal(s). diff --git a/journalbeat/reader/journal_other.go b/journalbeat/reader/journal_other.go index 82ad678c3266..26f0a7b5f1fe 100644 --- a/journalbeat/reader/journal_other.go +++ b/journalbeat/reader/journal_other.go @@ -22,9 +22,9 @@ package reader import ( "errors" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) // Reader stub for non linux builds. diff --git a/journalbeat/reader/journal_test.go b/journalbeat/reader/journal_test.go index 8ce288e05d7f..c54ee800c433 100644 --- a/journalbeat/reader/journal_test.go +++ b/journalbeat/reader/journal_test.go @@ -23,13 +23,13 @@ import ( "reflect" "testing" - "github.com/coreos/go-systemd/sdjournal" + "github.com/coreos/go-systemd/v22/sdjournal" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type ToEventTestCase struct { diff --git a/libbeat/api/make_listener_posix.go b/libbeat/api/make_listener_posix.go index 672af5cc95df..422a1c542911 100644 --- a/libbeat/api/make_listener_posix.go +++ b/libbeat/api/make_listener_posix.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/api/npipe" ) func makeListener(cfg Config) (net.Listener, error) { diff --git a/libbeat/api/make_listener_windows.go b/libbeat/api/make_listener_windows.go index ef549f46a9af..adc9dff4efd5 100644 --- a/libbeat/api/make_listener_windows.go +++ b/libbeat/api/make_listener_windows.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/api/npipe" ) func makeListener(cfg Config) (net.Listener, error) { diff --git a/libbeat/api/routes.go b/libbeat/api/routes.go index e78dfa16ae84..8cb35cfc23ca 100644 --- a/libbeat/api/routes.go +++ b/libbeat/api/routes.go @@ -22,9 +22,9 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type handlerFunc func(http.ResponseWriter, *http.Request) diff --git a/libbeat/api/server.go b/libbeat/api/server.go index 44db0baed145..682fd726ce91 100644 --- a/libbeat/api/server.go +++ b/libbeat/api/server.go @@ -24,8 +24,8 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Server takes cares of correctly starting the HTTP component of the API diff --git a/libbeat/api/server_test.go b/libbeat/api/server_test.go index c021113ccb13..e4df0f5b4e37 100644 --- a/libbeat/api/server_test.go +++ b/libbeat/api/server_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfiguration(t *testing.T) { diff --git a/libbeat/api/server_windows_test.go b/libbeat/api/server_windows_test.go index 0931da865c33..51efc0f1f819 100644 --- a/libbeat/api/server_windows_test.go +++ b/libbeat/api/server_windows_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/api/npipe" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNamedPipe(t *testing.T) { diff --git a/libbeat/asset/asset.go b/libbeat/asset/asset.go index d005545b5fba..51ebb2032492 100644 --- a/libbeat/asset/asset.go +++ b/libbeat/asset/asset.go @@ -46,7 +46,7 @@ var Template = template.Must(template.New("normalizations").Parse(` package {{ .Package }} import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/libbeat/autodiscover/appender.go b/libbeat/autodiscover/appender.go index 08debb573bac..b82ad0c8e7cd 100644 --- a/libbeat/autodiscover/appender.go +++ b/libbeat/autodiscover/appender.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Appender provides an interface by which extra configuration can be added into configs diff --git a/libbeat/autodiscover/appender_test.go b/libbeat/autodiscover/appender_test.go index 78e51129a6e0..9dbf455e7b20 100644 --- a/libbeat/autodiscover/appender_test.go +++ b/libbeat/autodiscover/appender_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) type fakeAppender struct{} diff --git a/libbeat/autodiscover/appenders/config/config.go b/libbeat/autodiscover/appenders/config/config.go index 1efaaf14bf8c..018ee1b587d8 100644 --- a/libbeat/autodiscover/appenders/config/config.go +++ b/libbeat/autodiscover/appenders/config/config.go @@ -22,13 +22,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/appenders/config/config_test.go b/libbeat/autodiscover/appenders/config/config_test.go index e92252883f3e..36b4ee5b390c 100644 --- a/libbeat/autodiscover/appenders/config/config_test.go +++ b/libbeat/autodiscover/appenders/config/config_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestGenerateAppender(t *testing.T) { diff --git a/libbeat/autodiscover/appenders/registry.go b/libbeat/autodiscover/appenders/registry.go index e72700fc368a..8a3bbc2f9ab8 100644 --- a/libbeat/autodiscover/appenders/registry.go +++ b/libbeat/autodiscover/appenders/registry.go @@ -20,8 +20,8 @@ package appenders import ( "errors" - "github.com/elastic/beats/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type appenderPlugin struct { diff --git a/libbeat/autodiscover/autodiscover.go b/libbeat/autodiscover/autodiscover.go index 5ddeb21a0ed7..6ceb46fa794f 100644 --- a/libbeat/autodiscover/autodiscover.go +++ b/libbeat/autodiscover/autodiscover.go @@ -23,13 +23,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover/meta" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/meta" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/autodiscover/autodiscover_test.go b/libbeat/autodiscover/autodiscover_test.go index c454a8c64adb..c466785d4b95 100644 --- a/libbeat/autodiscover/autodiscover_test.go +++ b/libbeat/autodiscover/autodiscover_test.go @@ -26,11 +26,11 @@ import ( "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) type mockRunner struct { diff --git a/libbeat/autodiscover/builder.go b/libbeat/autodiscover/builder.go index aa966d592c8b..b77ef847a97b 100644 --- a/libbeat/autodiscover/builder.go +++ b/libbeat/autodiscover/builder.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Builder provides an interface by which configs can be built from provider metadata diff --git a/libbeat/autodiscover/builder/helper.go b/libbeat/autodiscover/builder/helper.go index 91fe093acea4..b6d52a08eb58 100644 --- a/libbeat/autodiscover/builder/helper.go +++ b/libbeat/autodiscover/builder/helper.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // GetContainerID returns the id of a container diff --git a/libbeat/autodiscover/builder/helper_test.go b/libbeat/autodiscover/builder/helper_test.go index 530f1147a8c0..e8b5ce521791 100644 --- a/libbeat/autodiscover/builder/helper_test.go +++ b/libbeat/autodiscover/builder/helper_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestGetProcessors(t *testing.T) { diff --git a/libbeat/autodiscover/builder/plugin.go b/libbeat/autodiscover/builder/plugin.go index 87f33cda3bf2..83abccc2097c 100644 --- a/libbeat/autodiscover/builder/plugin.go +++ b/libbeat/autodiscover/builder/plugin.go @@ -20,8 +20,8 @@ package builder import ( "errors" - "github.com/elastic/beats/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type builderPlugin struct { diff --git a/libbeat/autodiscover/builder_test.go b/libbeat/autodiscover/builder_test.go index d305dd6fa4a3..75cc0dafaebf 100644 --- a/libbeat/autodiscover/builder_test.go +++ b/libbeat/autodiscover/builder_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) type fakeBuilder struct{} diff --git a/libbeat/autodiscover/config.go b/libbeat/autodiscover/config.go index 7072d5b9d7d9..f4d8081e2928 100644 --- a/libbeat/autodiscover/config.go +++ b/libbeat/autodiscover/config.go @@ -18,7 +18,7 @@ package autodiscover import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Config settings for Autodiscover diff --git a/libbeat/autodiscover/factoryadapter.go b/libbeat/autodiscover/factoryadapter.go index 358addd6bb9f..64dc9f15ca74 100644 --- a/libbeat/autodiscover/factoryadapter.go +++ b/libbeat/autodiscover/factoryadapter.go @@ -20,10 +20,10 @@ package autodiscover import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // FactoryAdapter is an adapter that works with any cfgfile.RunnerFactory. diff --git a/libbeat/autodiscover/meta/meta.go b/libbeat/autodiscover/meta/meta.go index 28464dfd9ebb..bf1a2048caed 100644 --- a/libbeat/autodiscover/meta/meta.go +++ b/libbeat/autodiscover/meta/meta.go @@ -20,7 +20,7 @@ package meta import ( "sync" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Map stores a map of id -> MapStrPointer diff --git a/libbeat/autodiscover/meta/meta_test.go b/libbeat/autodiscover/meta/meta_test.go index ea7a31c3eac2..d48351324ebf 100644 --- a/libbeat/autodiscover/meta/meta_test.go +++ b/libbeat/autodiscover/meta/meta_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestStoreNil(t *testing.T) { diff --git a/libbeat/autodiscover/provider.go b/libbeat/autodiscover/provider.go index dc7d416b1307..f7bfefc69d05 100644 --- a/libbeat/autodiscover/provider.go +++ b/libbeat/autodiscover/provider.go @@ -23,9 +23,9 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Provider for autodiscover diff --git a/libbeat/autodiscover/providers/docker/config.go b/libbeat/autodiscover/providers/docker/config.go index cba67993677c..4780addecbde 100644 --- a/libbeat/autodiscover/providers/docker/config.go +++ b/libbeat/autodiscover/providers/docker/config.go @@ -22,9 +22,9 @@ package docker import ( "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Config for docker autodiscover provider diff --git a/libbeat/autodiscover/providers/docker/docker.go b/libbeat/autodiscover/providers/docker/docker.go index 1189137f608a..3e487a666704 100644 --- a/libbeat/autodiscover/providers/docker/docker.go +++ b/libbeat/autodiscover/providers/docker/docker.go @@ -26,15 +26,15 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/providers/docker/docker_integration_test.go b/libbeat/autodiscover/providers/docker/docker_integration_test.go index 288b004bd468..b8afbafbb62b 100644 --- a/libbeat/autodiscover/providers/docker/docker_integration_test.go +++ b/libbeat/autodiscover/providers/docker/docker_integration_test.go @@ -23,15 +23,15 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - dk "github.com/elastic/beats/libbeat/tests/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + dk "github.com/elastic/beats/v7/libbeat/tests/docker" ) // Test docker start emits an autodiscover event diff --git a/libbeat/autodiscover/providers/docker/docker_test.go b/libbeat/autodiscover/providers/docker/docker_test.go index ba663d30314d..40fef07f1834 100644 --- a/libbeat/autodiscover/providers/docker/docker_test.go +++ b/libbeat/autodiscover/providers/docker/docker_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/docker" ) func TestGenerateHints(t *testing.T) { diff --git a/libbeat/autodiscover/providers/jolokia/config.go b/libbeat/autodiscover/providers/jolokia/config.go index 7bde0b938268..8d81ac2cc8ac 100644 --- a/libbeat/autodiscover/providers/jolokia/config.go +++ b/libbeat/autodiscover/providers/jolokia/config.go @@ -20,8 +20,8 @@ package jolokia import ( "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/libbeat/autodiscover/providers/jolokia/config_test.go b/libbeat/autodiscover/providers/jolokia/config_test.go index a72ae0dffa9b..3135a22c4afc 100644 --- a/libbeat/autodiscover/providers/jolokia/config_test.go +++ b/libbeat/autodiscover/providers/jolokia/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestInterfaceConfigsUnpack(t *testing.T) { diff --git a/libbeat/autodiscover/providers/jolokia/discovery.go b/libbeat/autodiscover/providers/jolokia/discovery.go index ed026ec3b078..380369fa9118 100644 --- a/libbeat/autodiscover/providers/jolokia/discovery.go +++ b/libbeat/autodiscover/providers/jolokia/discovery.go @@ -27,11 +27,11 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/logp" ) // Jolokia Discovery query diff --git a/libbeat/autodiscover/providers/jolokia/jolokia.go b/libbeat/autodiscover/providers/jolokia/jolokia.go index f938e4a379a9..b370d747b893 100644 --- a/libbeat/autodiscover/providers/jolokia/jolokia.go +++ b/libbeat/autodiscover/providers/jolokia/jolokia.go @@ -23,10 +23,10 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func init() { diff --git a/libbeat/autodiscover/providers/kubernetes/config.go b/libbeat/autodiscover/providers/kubernetes/config.go index f443439c57f7..a1ec2db5dd51 100644 --- a/libbeat/autodiscover/providers/kubernetes/config.go +++ b/libbeat/autodiscover/providers/kubernetes/config.go @@ -23,12 +23,12 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // Config for kubernetes autodiscover provider diff --git a/libbeat/autodiscover/providers/kubernetes/config_test.go b/libbeat/autodiscover/providers/kubernetes/config_test.go index 727df2c0388c..55fd601037dd 100644 --- a/libbeat/autodiscover/providers/kubernetes/config_test.go +++ b/libbeat/autodiscover/providers/kubernetes/config_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestConfigWithCustomBuilders(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/kubernetes.go b/libbeat/autodiscover/providers/kubernetes/kubernetes.go index 52177f39b2b6..3e1685830e20 100644 --- a/libbeat/autodiscover/providers/kubernetes/kubernetes.go +++ b/libbeat/autodiscover/providers/kubernetes/kubernetes.go @@ -25,13 +25,13 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/providers/kubernetes/node.go b/libbeat/autodiscover/providers/kubernetes/node.go index 4d83294cd48d..bd529582f0cd 100644 --- a/libbeat/autodiscover/providers/kubernetes/node.go +++ b/libbeat/autodiscover/providers/kubernetes/node.go @@ -25,13 +25,13 @@ import ( v1 "k8s.io/api/core/v1" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type node struct { diff --git a/libbeat/autodiscover/providers/kubernetes/node_test.go b/libbeat/autodiscover/providers/kubernetes/node_test.go index 8b0dd7f9a5b7..0685adfe1bdd 100644 --- a/libbeat/autodiscover/providers/kubernetes/node_test.go +++ b/libbeat/autodiscover/providers/kubernetes/node_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints_Node(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/pod.go b/libbeat/autodiscover/providers/kubernetes/pod.go index 9cd5094fa5ab..44f85a2363a3 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod.go +++ b/libbeat/autodiscover/providers/kubernetes/pod.go @@ -24,13 +24,13 @@ import ( "github.com/gofrs/uuid" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type pod struct { diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go index 1d3d11b61bd8..b105aa0991fe 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod_test.go +++ b/libbeat/autodiscover/providers/kubernetes/pod_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/service.go b/libbeat/autodiscover/providers/kubernetes/service.go index f840f9c09698..8708833cd8dd 100644 --- a/libbeat/autodiscover/providers/kubernetes/service.go +++ b/libbeat/autodiscover/providers/kubernetes/service.go @@ -21,17 +21,17 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type service struct { diff --git a/libbeat/autodiscover/providers/kubernetes/service_test.go b/libbeat/autodiscover/providers/kubernetes/service_test.go index aa056fc11499..a17ef8a569d7 100644 --- a/libbeat/autodiscover/providers/kubernetes/service_test.go +++ b/libbeat/autodiscover/providers/kubernetes/service_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints_Service(t *testing.T) { diff --git a/libbeat/autodiscover/providers/plugin.go b/libbeat/autodiscover/providers/plugin.go index 6ace05aaf4b3..2e413032400a 100644 --- a/libbeat/autodiscover/providers/plugin.go +++ b/libbeat/autodiscover/providers/plugin.go @@ -20,8 +20,8 @@ package providers import ( "errors" - "github.com/elastic/beats/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type providerPlugin struct { diff --git a/libbeat/autodiscover/registry.go b/libbeat/autodiscover/registry.go index a08d637ad424..97955635e502 100644 --- a/libbeat/autodiscover/registry.go +++ b/libbeat/autodiscover/registry.go @@ -20,7 +20,7 @@ package autodiscover import ( "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Register of autodiscover providers diff --git a/libbeat/autodiscover/template/config.go b/libbeat/autodiscover/template/config.go index c1a2c2b6c513..151f76dde0f3 100644 --- a/libbeat/autodiscover/template/config.go +++ b/libbeat/autodiscover/template/config.go @@ -18,10 +18,10 @@ package template import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/go-ucfg" ) diff --git a/libbeat/autodiscover/template/config_test.go b/libbeat/autodiscover/template/config_test.go index 8bf554768474..570de15a840b 100644 --- a/libbeat/autodiscover/template/config_test.go +++ b/libbeat/autodiscover/template/config_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestConfigsMapping(t *testing.T) { diff --git a/libbeat/beat/beat.go b/libbeat/beat/beat.go index 9423b774dd10..40e6bf34ff4f 100644 --- a/libbeat/beat/beat.go +++ b/libbeat/beat/beat.go @@ -18,8 +18,8 @@ package beat import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/management" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/management" ) // Creator initializes and configures a new Beater instance used to execute diff --git a/libbeat/beat/event.go b/libbeat/beat/event.go index d156a887a93c..4ef560420396 100644 --- a/libbeat/beat/event.go +++ b/libbeat/beat/event.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // FlagField fields used to keep information or errors when events are parsed. diff --git a/libbeat/beat/event_test.go b/libbeat/beat/event_test.go index 789a3e0a994b..384ece4d1aea 100644 --- a/libbeat/beat/event_test.go +++ b/libbeat/beat/event_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func newEmptyEvent() *Event { diff --git a/libbeat/beat/pipeline.go b/libbeat/beat/pipeline.go index f07d2f0a701b..c4f4665af1b4 100644 --- a/libbeat/beat/pipeline.go +++ b/libbeat/beat/pipeline.go @@ -20,7 +20,7 @@ package beat import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Pipeline interface { diff --git a/libbeat/cfgfile/cfgfile.go b/libbeat/cfgfile/cfgfile.go index b0c9f7ffd220..767cbd34bc57 100644 --- a/libbeat/cfgfile/cfgfile.go +++ b/libbeat/cfgfile/cfgfile.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Command line flags. diff --git a/libbeat/cfgfile/glob_watcher.go b/libbeat/cfgfile/glob_watcher.go index 2aff04adad54..fc3e64eafa98 100644 --- a/libbeat/cfgfile/glob_watcher.go +++ b/libbeat/cfgfile/glob_watcher.go @@ -24,7 +24,7 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type GlobWatcher struct { diff --git a/libbeat/cfgfile/list.go b/libbeat/cfgfile/list.go index c836c6b10029..db02c56bbdd1 100644 --- a/libbeat/cfgfile/list.go +++ b/libbeat/cfgfile/list.go @@ -24,10 +24,10 @@ import ( "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" ) // RunnerList implements a reloadable.List of Runners diff --git a/libbeat/cfgfile/list_test.go b/libbeat/cfgfile/list_test.go index e4851e5d1cb9..b9ae56878318 100644 --- a/libbeat/cfgfile/list_test.go +++ b/libbeat/cfgfile/list_test.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" ) type runner struct { diff --git a/libbeat/cfgfile/reload.go b/libbeat/cfgfile/reload.go index dee3be817b5f..6b1be3d16e57 100644 --- a/libbeat/cfgfile/reload.go +++ b/libbeat/cfgfile/reload.go @@ -26,12 +26,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/cfgfile/reload_test.go b/libbeat/cfgfile/reload_test.go index d6575acdaee1..d52b4f293ff5 100644 --- a/libbeat/cfgfile/reload_test.go +++ b/libbeat/cfgfile/reload_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReloader(t *testing.T) { diff --git a/libbeat/cloudid/cloudid.go b/libbeat/cloudid/cloudid.go index 9b0d5102771c..5e39dee27f1d 100644 --- a/libbeat/cloudid/cloudid.go +++ b/libbeat/cloudid/cloudid.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const defaultCloudPort = "443" diff --git a/libbeat/cloudid/cloudid_test.go b/libbeat/cloudid/cloudid_test.go index aea97646d9ec..889fa152a108 100644 --- a/libbeat/cloudid/cloudid_test.go +++ b/libbeat/cloudid/cloudid_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDecode(t *testing.T) { diff --git a/libbeat/cmd/completion.go b/libbeat/cmd/completion.go index 578d943775ed..7c7ca31a0749 100644 --- a/libbeat/cmd/completion.go +++ b/libbeat/cmd/completion.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/cmd/instance" "github.com/spf13/cobra" ) diff --git a/libbeat/cmd/export.go b/libbeat/cmd/export.go index 82e89bb09ee8..44bb95ab60fb 100644 --- a/libbeat/cmd/export.go +++ b/libbeat/cmd/export.go @@ -20,8 +20,8 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/export" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/cmd/export" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) func genExportCmd(settings instance.Settings) *cobra.Command { diff --git a/libbeat/cmd/export/config.go b/libbeat/cmd/export/config.go index df9816a00e3c..c89cd29d5dd5 100644 --- a/libbeat/cmd/export/config.go +++ b/libbeat/cmd/export/config.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cli" ) // GenExportConfigCmd write to stdout the current configuration in the YAML format. diff --git a/libbeat/cmd/export/dashboard.go b/libbeat/cmd/export/dashboard.go index 552fbd6c6e68..9cd63f03366b 100644 --- a/libbeat/cmd/export/dashboard.go +++ b/libbeat/cmd/export/dashboard.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/dashboards" + "github.com/elastic/beats/v7/libbeat/kibana" ) // GenDashboardCmd is the command used to export a dashboard. diff --git a/libbeat/cmd/export/export.go b/libbeat/cmd/export/export.go index 07ec27edf087..b5bbe4ba1342 100644 --- a/libbeat/cmd/export/export.go +++ b/libbeat/cmd/export/export.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/version" ) type stdoutClient struct { diff --git a/libbeat/cmd/export/ilm_policy.go b/libbeat/cmd/export/ilm_policy.go index 57a3c32103aa..b2a8b8455142 100644 --- a/libbeat/cmd/export/ilm_policy.go +++ b/libbeat/cmd/export/ilm_policy.go @@ -20,9 +20,9 @@ package export import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" ) // GenGetILMPolicyCmd is the command used to export the ilm policy. diff --git a/libbeat/cmd/export/index_pattern.go b/libbeat/cmd/export/index_pattern.go index 5fc4e7f45601..86f6d9c966a7 100644 --- a/libbeat/cmd/export/index_pattern.go +++ b/libbeat/cmd/export/index_pattern.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" ) // GenIndexPatternConfigCmd generates an index pattern for Kibana diff --git a/libbeat/cmd/export/template.go b/libbeat/cmd/export/template.go index 6dd145ec4087..23d572fad2af 100644 --- a/libbeat/cmd/export/template.go +++ b/libbeat/cmd/export/template.go @@ -20,9 +20,9 @@ package export import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" ) // GenTemplateConfigCmd is the command used to export the elasticsearch template. diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index 2e5940d293c7..9ab8af14a135 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -33,7 +33,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/kibana" "github.com/gofrs/uuid" errw "github.com/pkg/errors" @@ -43,34 +43,34 @@ import ( "github.com/elastic/go-sysinfo/types" ucfg "github.com/elastic/go-ucfg" - "github.com/elastic/beats/libbeat/api" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cloudid" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/common/seccomp" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/keystore" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/logp/configure" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/metric/system/host" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/monitoring/report/log" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/plugin" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" - svc "github.com/elastic/beats/libbeat/service" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/api" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cloudid" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/common/seccomp" + "github.com/elastic/beats/v7/libbeat/dashboards" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/keystore" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp/configure" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/metric/system/host" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/monitoring/report/log" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + svc "github.com/elastic/beats/v7/libbeat/service" + "github.com/elastic/beats/v7/libbeat/version" ) // Beat provides the runnable and configurable instance of a beat. diff --git a/libbeat/cmd/instance/beat_test.go b/libbeat/cmd/instance/beat_test.go index 9ea780ed4b32..8c04e87390f6 100644 --- a/libbeat/cmd/instance/beat_test.go +++ b/libbeat/cmd/instance/beat_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cfgfile" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" diff --git a/libbeat/cmd/instance/imports_common.go b/libbeat/cmd/instance/imports_common.go index d8fa4b9f0cfa..62ca7d76d7b9 100644 --- a/libbeat/cmd/instance/imports_common.go +++ b/libbeat/cmd/instance/imports_common.go @@ -18,22 +18,22 @@ package instance import ( - _ "github.com/elastic/beats/libbeat/autodiscover/appenders/config" // Register autodiscover appenders - _ "github.com/elastic/beats/libbeat/autodiscover/providers/jolokia" - _ "github.com/elastic/beats/libbeat/monitoring/report/elasticsearch" // Register default monitoring reporting - _ "github.com/elastic/beats/libbeat/processors/actions" // Register default processors. - _ "github.com/elastic/beats/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_host_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_id" - _ "github.com/elastic/beats/libbeat/processors/add_locale" - _ "github.com/elastic/beats/libbeat/processors/add_observer_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_process_metadata" - _ "github.com/elastic/beats/libbeat/processors/communityid" - _ "github.com/elastic/beats/libbeat/processors/convert" - _ "github.com/elastic/beats/libbeat/processors/dissect" - _ "github.com/elastic/beats/libbeat/processors/dns" - _ "github.com/elastic/beats/libbeat/processors/extract_array" - _ "github.com/elastic/beats/libbeat/processors/fingerprint" - _ "github.com/elastic/beats/libbeat/processors/registered_domain" - _ "github.com/elastic/beats/libbeat/publisher/includes" // Register publisher pipeline modules + _ "github.com/elastic/beats/v7/libbeat/autodiscover/appenders/config" // Register autodiscover appenders + _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/jolokia" + _ "github.com/elastic/beats/v7/libbeat/monitoring/report/elasticsearch" // Register default monitoring reporting + _ "github.com/elastic/beats/v7/libbeat/processors/actions" // Register default processors. + _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/add_host_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/add_id" + _ "github.com/elastic/beats/v7/libbeat/processors/add_locale" + _ "github.com/elastic/beats/v7/libbeat/processors/add_observer_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/add_process_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/communityid" + _ "github.com/elastic/beats/v7/libbeat/processors/convert" + _ "github.com/elastic/beats/v7/libbeat/processors/dissect" + _ "github.com/elastic/beats/v7/libbeat/processors/dns" + _ "github.com/elastic/beats/v7/libbeat/processors/extract_array" + _ "github.com/elastic/beats/v7/libbeat/processors/fingerprint" + _ "github.com/elastic/beats/v7/libbeat/processors/registered_domain" + _ "github.com/elastic/beats/v7/libbeat/publisher/includes" // Register publisher pipeline modules ) diff --git a/libbeat/cmd/instance/imports_docker.go b/libbeat/cmd/instance/imports_docker.go index faca620d087c..12d379714ed1 100644 --- a/libbeat/cmd/instance/imports_docker.go +++ b/libbeat/cmd/instance/imports_docker.go @@ -20,8 +20,8 @@ package instance import ( - _ "github.com/elastic/beats/libbeat/autodiscover/providers/docker" // Register autodiscover providers - _ "github.com/elastic/beats/libbeat/autodiscover/providers/kubernetes" - _ "github.com/elastic/beats/libbeat/processors/add_docker_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/docker" // Register autodiscover providers + _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" + _ "github.com/elastic/beats/v7/libbeat/processors/add_docker_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) diff --git a/libbeat/cmd/instance/locker.go b/libbeat/cmd/instance/locker.go index 9cfe9603880d..9e7f929ef495 100644 --- a/libbeat/cmd/instance/locker.go +++ b/libbeat/cmd/instance/locker.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/flock" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/cmd/instance/locker_test.go b/libbeat/cmd/instance/locker_test.go index e6feab0e7fed..7e15517edb53 100644 --- a/libbeat/cmd/instance/locker_test.go +++ b/libbeat/cmd/instance/locker_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) // TestLocker tests that two beats pointing to the same data path cannot diff --git a/libbeat/cmd/instance/metrics.go b/libbeat/cmd/instance/metrics.go index 9b0697d1e0bf..54cd3ab55d83 100644 --- a/libbeat/cmd/instance/metrics.go +++ b/libbeat/cmd/instance/metrics.go @@ -23,11 +23,11 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/libbeat/cmd/instance/metrics_common.go b/libbeat/cmd/instance/metrics_common.go index ca45f08d53d5..feff54b48411 100644 --- a/libbeat/cmd/instance/metrics_common.go +++ b/libbeat/cmd/instance/metrics_common.go @@ -22,9 +22,9 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report/log" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report/log" ) var ( diff --git a/libbeat/cmd/instance/metrics_file_descriptors.go b/libbeat/cmd/instance/metrics_file_descriptors.go index d120efabcc77..5d255fd483d1 100644 --- a/libbeat/cmd/instance/metrics_file_descriptors.go +++ b/libbeat/cmd/instance/metrics_file_descriptors.go @@ -22,8 +22,8 @@ package instance import ( "fmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func setupLinuxBSDFDMetrics() { diff --git a/libbeat/cmd/instance/metrics_handles.go b/libbeat/cmd/instance/metrics_handles.go index 6848a20f105c..497fe5edcd6e 100644 --- a/libbeat/cmd/instance/metrics_handles.go +++ b/libbeat/cmd/instance/metrics_handles.go @@ -20,8 +20,8 @@ package instance import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" sysinfo "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/cmd/instance/metrics_other.go b/libbeat/cmd/instance/metrics_other.go index 37e092be4bb4..2ea96cd6c8e8 100644 --- a/libbeat/cmd/instance/metrics_other.go +++ b/libbeat/cmd/instance/metrics_other.go @@ -22,7 +22,7 @@ package instance import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func setupMetrics(name string) error { diff --git a/libbeat/cmd/instance/settings.go b/libbeat/cmd/instance/settings.go index 7b7ab66706d4..ee22dc084e0e 100644 --- a/libbeat/cmd/instance/settings.go +++ b/libbeat/cmd/instance/settings.go @@ -20,11 +20,11 @@ package instance import ( "github.com/spf13/pflag" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/publisher/processing" ) // Settings contains basic settings for any beat to pass into GenRootCmd diff --git a/libbeat/cmd/keystore.go b/libbeat/cmd/keystore.go index b2cffe2b7ebf..4410f1d4d745 100644 --- a/libbeat/cmd/keystore.go +++ b/libbeat/cmd/keystore.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/cobra" tml "golang.org/x/crypto/ssh/terminal" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/common/terminal" - "github.com/elastic/beats/libbeat/keystore" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/common/terminal" + "github.com/elastic/beats/v7/libbeat/keystore" ) func getKeystore(settings instance.Settings) (keystore.Keystore, error) { diff --git a/libbeat/cmd/modules.go b/libbeat/cmd/modules.go index 4bd6bff137ea..2accdf7a46f6 100644 --- a/libbeat/cmd/modules.go +++ b/libbeat/cmd/modules.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) // ModulesManager interface provides all actions needed to implement modules command diff --git a/libbeat/cmd/root.go b/libbeat/cmd/root.go index 94382eed5bae..b748225fa924 100644 --- a/libbeat/cmd/root.go +++ b/libbeat/cmd/root.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) func init() { diff --git a/libbeat/cmd/run.go b/libbeat/cmd/run.go index 7e52fca3cc64..b078aadaf89c 100644 --- a/libbeat/cmd/run.go +++ b/libbeat/cmd/run.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) func genRunCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/setup.go b/libbeat/cmd/setup.go index f3ed31b7afbe..23647e9445cd 100644 --- a/libbeat/cmd/setup.go +++ b/libbeat/cmd/setup.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) const ( diff --git a/libbeat/cmd/test.go b/libbeat/cmd/test.go index 1b17eca8f03f..95b07ff4ac70 100644 --- a/libbeat/cmd/test.go +++ b/libbeat/cmd/test.go @@ -20,9 +20,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/cmd/test" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/cmd/test" ) func genTestCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/test/config.go b/libbeat/cmd/test/config.go index e8dfd07dae73..dfc93344acf9 100644 --- a/libbeat/cmd/test/config.go +++ b/libbeat/cmd/test/config.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) func GenTestConfigCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/test/output.go b/libbeat/cmd/test/output.go index 6d4761d65a82..5df48051fc10 100644 --- a/libbeat/cmd/test/output.go +++ b/libbeat/cmd/test/output.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/testing" ) func GenTestOutputCmd(settings instance.Settings) *cobra.Command { diff --git a/libbeat/cmd/version.go b/libbeat/cmd/version.go index 6145c52e7074..7019ccd77c93 100644 --- a/libbeat/cmd/version.go +++ b/libbeat/cmd/version.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/version" ) // GenVersionCmd generates the command version for a Beat. diff --git a/libbeat/common/bus/bus.go b/libbeat/common/bus/bus.go index cb7393b0c5cb..7b3cf7f9d362 100644 --- a/libbeat/common/bus/bus.go +++ b/libbeat/common/bus/bus.go @@ -20,8 +20,8 @@ package bus import ( "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Event sent to the bus diff --git a/libbeat/common/bus/bus_test.go b/libbeat/common/bus/bus_test.go index c80d3d71a7e2..d87d9522c13b 100644 --- a/libbeat/common/bus/bus_test.go +++ b/libbeat/common/bus/bus_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestEmit(t *testing.T) { diff --git a/libbeat/common/cfgtype/byte_size.go b/libbeat/common/cfgtype/byte_size.go index 72776019afc9..a692cad586d7 100644 --- a/libbeat/common/cfgtype/byte_size.go +++ b/libbeat/common/cfgtype/byte_size.go @@ -22,7 +22,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // ByteSize defines a new configuration option that will parse `go-humanize` compatible values into a diff --git a/libbeat/common/cfgwarn/cfgwarn.go b/libbeat/common/cfgwarn/cfgwarn.go index f7ef2fba1d1f..e102ed20e4b6 100644 --- a/libbeat/common/cfgwarn/cfgwarn.go +++ b/libbeat/common/cfgwarn/cfgwarn.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const selector = "cfgwarn" diff --git a/libbeat/common/cfgwarn/removed.go b/libbeat/common/cfgwarn/removed.go index d7060bbada6a..68d3e5468d3b 100644 --- a/libbeat/common/cfgwarn/removed.go +++ b/libbeat/common/cfgwarn/removed.go @@ -23,7 +23,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func checkRemovedSettings(cfg *common.Config, settings ...string) error { diff --git a/libbeat/common/cfgwarn/removed_test.go b/libbeat/common/cfgwarn/removed_test.go index 3bbd819b2367..2615cd9e7edb 100644 --- a/libbeat/common/cfgwarn/removed_test.go +++ b/libbeat/common/cfgwarn/removed_test.go @@ -24,7 +24,7 @@ import ( "github.com/joeshaw/multierror" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRemovedSetting(t *testing.T) { diff --git a/libbeat/common/cleanup/cleanup_test.go b/libbeat/common/cleanup/cleanup_test.go index 5208dc750aa4..6b45b9de0f59 100644 --- a/libbeat/common/cleanup/cleanup_test.go +++ b/libbeat/common/cleanup/cleanup_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/cleanup" + "github.com/elastic/beats/v7/libbeat/common/cleanup" ) func TestIfBool(t *testing.T) { diff --git a/libbeat/common/config.go b/libbeat/common/config.go index 448b2476156d..e4155c4f3afb 100644 --- a/libbeat/common/config.go +++ b/libbeat/common/config.go @@ -27,8 +27,8 @@ import ( "runtime" "strings" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ucfg "github.com/elastic/go-ucfg" "github.com/elastic/go-ucfg/cfgutil" "github.com/elastic/go-ucfg/yaml" diff --git a/libbeat/common/docker/client.go b/libbeat/common/docker/client.go index a86edcfcd109..de29a0f8c22e 100644 --- a/libbeat/common/docker/client.go +++ b/libbeat/common/docker/client.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // NewClient builds and returns a new Docker client. On the first request the diff --git a/libbeat/common/docker/helpers.go b/libbeat/common/docker/helpers.go index ae9ea0d62898..e53c84997106 100644 --- a/libbeat/common/docker/helpers.go +++ b/libbeat/common/docker/helpers.go @@ -20,8 +20,8 @@ package docker import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // ExtractContainerName strips the `/` characters that frequently appear in container names diff --git a/libbeat/common/docker/watcher.go b/libbeat/common/docker/watcher.go index 388aa2589a46..0543d37e9c33 100644 --- a/libbeat/common/docker/watcher.go +++ b/libbeat/common/docker/watcher.go @@ -31,8 +31,8 @@ import ( "github.com/docker/go-connections/tlsconfig" "golang.org/x/net/context" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) // Select Docker API version diff --git a/libbeat/common/docker/watcher_test.go b/libbeat/common/docker/watcher_test.go index 31f33dde9157..a7fb9ca73fb4 100644 --- a/libbeat/common/docker/watcher_test.go +++ b/libbeat/common/docker/watcher_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/context" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type MockClient struct { diff --git a/libbeat/common/event.go b/libbeat/common/event.go index 0502a3ce0274..f68cf33cc87a 100644 --- a/libbeat/common/event.go +++ b/libbeat/common/event.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem() diff --git a/libbeat/common/event_test.go b/libbeat/common/event_test.go index 1bf622f38182..c9d3a36e0c94 100644 --- a/libbeat/common/event_test.go +++ b/libbeat/common/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestConvertNestedMapStr(t *testing.T) { diff --git a/libbeat/common/file/fileinfo_test.go b/libbeat/common/file/fileinfo_test.go index ce3e43c06ace..9df25ba638a7 100644 --- a/libbeat/common/file/fileinfo_test.go +++ b/libbeat/common/file/fileinfo_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) func TestStat(t *testing.T) { diff --git a/libbeat/common/file/rotator_test.go b/libbeat/common/file/rotator_test.go index 8a2c52b3ae38..ccafad556665 100644 --- a/libbeat/common/file/rotator_test.go +++ b/libbeat/common/file/rotator_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ) const logMessage = "Test file rotator.\n" diff --git a/libbeat/common/flowhash/examples/example.go b/libbeat/common/flowhash/examples/example.go index 467f8fafad79..7930f0ea4633 100644 --- a/libbeat/common/flowhash/examples/example.go +++ b/libbeat/common/flowhash/examples/example.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/libbeat/common/flowhash" + "github.com/elastic/beats/v7/libbeat/common/flowhash" ) // ExampleCommunityIDHash shows example usage for flowhash.CommunityID.Hash() diff --git a/libbeat/common/fmtstr/formatevents.go b/libbeat/common/fmtstr/formatevents.go index e7950a39d0f7..1861b7a60e40 100644 --- a/libbeat/common/fmtstr/formatevents.go +++ b/libbeat/common/fmtstr/formatevents.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/dtfmt" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/dtfmt" ) // EventFormatString implements format string support on events diff --git a/libbeat/common/fmtstr/formatevents_test.go b/libbeat/common/fmtstr/formatevents_test.go index 01d21dd81e34..6e78eb5713f9 100644 --- a/libbeat/common/fmtstr/formatevents_test.go +++ b/libbeat/common/fmtstr/formatevents_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventFormatString(t *testing.T) { diff --git a/libbeat/common/fmtstr/formattimestamp.go b/libbeat/common/fmtstr/formattimestamp.go index 68c22d636496..e58ce8b2cd9f 100644 --- a/libbeat/common/fmtstr/formattimestamp.go +++ b/libbeat/common/fmtstr/formattimestamp.go @@ -20,8 +20,8 @@ package fmtstr import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // TimestampFormatString is a wrapper around EventFormatString for the diff --git a/libbeat/common/fmtstr/formattimestamp_test.go b/libbeat/common/fmtstr/formattimestamp_test.go index d194f597ad5f..4df8e6b3fdc1 100644 --- a/libbeat/common/fmtstr/formattimestamp_test.go +++ b/libbeat/common/fmtstr/formattimestamp_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestTimestampFormatString(t *testing.T) { diff --git a/libbeat/common/jsontransform/jsonhelper.go b/libbeat/common/jsontransform/jsonhelper.go index bd4b4454d312..1490bcff1706 100644 --- a/libbeat/common/jsontransform/jsonhelper.go +++ b/libbeat/common/jsontransform/jsonhelper.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // WriteJSONKeys writes the json keys to the given event based on the overwriteKeys option and the addErrKey diff --git a/libbeat/common/jsontransform/transform.go b/libbeat/common/jsontransform/transform.go index dbb2d27c856d..b6e19a06fe37 100644 --- a/libbeat/common/jsontransform/transform.go +++ b/libbeat/common/jsontransform/transform.go @@ -20,7 +20,7 @@ package jsontransform import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // TransformNumbers walks a json decoded tree an replaces json.Number diff --git a/libbeat/common/kubernetes/metadata/config.go b/libbeat/common/kubernetes/metadata/config.go index 78abe6d8e539..3d3a028d13c5 100644 --- a/libbeat/common/kubernetes/metadata/config.go +++ b/libbeat/common/kubernetes/metadata/config.go @@ -17,7 +17,7 @@ package metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Config declares supported configuration for metadata generation type Config struct { diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go index b2205c91dd90..d81f79f28d58 100644 --- a/libbeat/common/kubernetes/metadata/metadata.go +++ b/libbeat/common/kubernetes/metadata/metadata.go @@ -18,9 +18,9 @@ package metadata import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // MetaGen allows creation of metadata from either Kubernetes resources or their Resource names. diff --git a/libbeat/common/kubernetes/metadata/namespace.go b/libbeat/common/kubernetes/metadata/namespace.go index 366b72884d2a..92dfbc55b2af 100644 --- a/libbeat/common/kubernetes/metadata/namespace.go +++ b/libbeat/common/kubernetes/metadata/namespace.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) const resource = "namespace" diff --git a/libbeat/common/kubernetes/metadata/namespace_test.go b/libbeat/common/kubernetes/metadata/namespace_test.go index 4011a2f00530..5ac460d7ca77 100644 --- a/libbeat/common/kubernetes/metadata/namespace_test.go +++ b/libbeat/common/kubernetes/metadata/namespace_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestNamespace_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/node.go b/libbeat/common/kubernetes/metadata/node.go index 309e7489a8ca..9d15868177f9 100644 --- a/libbeat/common/kubernetes/metadata/node.go +++ b/libbeat/common/kubernetes/metadata/node.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type node struct { diff --git a/libbeat/common/kubernetes/metadata/node_test.go b/libbeat/common/kubernetes/metadata/node_test.go index 9d198361ab91..226e84710c24 100644 --- a/libbeat/common/kubernetes/metadata/node_test.go +++ b/libbeat/common/kubernetes/metadata/node_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestNode_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index 018b710e4b43..c25db1f7a76a 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type pod struct { diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go index a5c3f2658a46..34bea7a75d3f 100644 --- a/libbeat/common/kubernetes/metadata/pod_test.go +++ b/libbeat/common/kubernetes/metadata/pod_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestPod_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/resource.go b/libbeat/common/kubernetes/metadata/resource.go index eb00455ffabc..d9610a32f37b 100644 --- a/libbeat/common/kubernetes/metadata/resource.go +++ b/libbeat/common/kubernetes/metadata/resource.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // Resource generates metadata for any kubernetes resource diff --git a/libbeat/common/kubernetes/metadata/resource_test.go b/libbeat/common/kubernetes/metadata/resource_test.go index dbf168644af4..01e7280a4f5e 100644 --- a/libbeat/common/kubernetes/metadata/resource_test.go +++ b/libbeat/common/kubernetes/metadata/resource_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestResource_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/service.go b/libbeat/common/kubernetes/metadata/service.go index 7c2fab68fd37..4577d898ec28 100644 --- a/libbeat/common/kubernetes/metadata/service.go +++ b/libbeat/common/kubernetes/metadata/service.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type service struct { diff --git a/libbeat/common/kubernetes/metadata/service_test.go b/libbeat/common/kubernetes/metadata/service_test.go index dfda4e9db27f..a574f1a7b7a1 100644 --- a/libbeat/common/kubernetes/metadata/service_test.go +++ b/libbeat/common/kubernetes/metadata/service_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestService_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/util.go b/libbeat/common/kubernetes/util.go index a8f1254b64a2..470d07373eee 100644 --- a/libbeat/common/kubernetes/util.go +++ b/libbeat/common/kubernetes/util.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const defaultNode = "localhost" diff --git a/libbeat/common/kubernetes/watcher.go b/libbeat/common/kubernetes/watcher.go index 79f2b8625794..33cc808358ac 100644 --- a/libbeat/common/kubernetes/watcher.go +++ b/libbeat/common/kubernetes/watcher.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/common/mapstr_test.go b/libbeat/common/mapstr_test.go index 784814bdac38..de633ff162ea 100644 --- a/libbeat/common/mapstr_test.go +++ b/libbeat/common/mapstr_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap/zapcore" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestMapStrUpdate(t *testing.T) { diff --git a/libbeat/common/reload/reload.go b/libbeat/common/reload/reload.go index ceb377274b55..ed2fe528363d 100644 --- a/libbeat/common/reload/reload.go +++ b/libbeat/common/reload/reload.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Register holds a registry of reloadable objects diff --git a/libbeat/common/safemapstr/safemapstr.go b/libbeat/common/safemapstr/safemapstr.go index 75afe81226ed..07d7d95d2eca 100644 --- a/libbeat/common/safemapstr/safemapstr.go +++ b/libbeat/common/safemapstr/safemapstr.go @@ -20,7 +20,7 @@ package safemapstr import ( "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const alternativeKey = "value" diff --git a/libbeat/common/safemapstr/safemapstr_test.go b/libbeat/common/safemapstr/safemapstr_test.go index 0e3a9c95a7b5..ce46d0300ec5 100644 --- a/libbeat/common/safemapstr/safemapstr_test.go +++ b/libbeat/common/safemapstr/safemapstr_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestPut(t *testing.T) { diff --git a/libbeat/common/schema/mapstriface/mapstriface.go b/libbeat/common/schema/mapstriface/mapstriface.go index cda5c093ac9b..d08631f78c47 100644 --- a/libbeat/common/schema/mapstriface/mapstriface.go +++ b/libbeat/common/schema/mapstriface/mapstriface.go @@ -77,9 +77,9 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/schema" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/logp" ) type ConvMap struct { diff --git a/libbeat/common/schema/mapstriface/mapstriface_test.go b/libbeat/common/schema/mapstriface/mapstriface_test.go index 9bd53cb404d9..dcc56b24addb 100644 --- a/libbeat/common/schema/mapstriface/mapstriface_test.go +++ b/libbeat/common/schema/mapstriface/mapstriface_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" ) func TestConversions(t *testing.T) { diff --git a/libbeat/common/schema/mapstrstr/mapstrstr.go b/libbeat/common/schema/mapstrstr/mapstrstr.go index 7b9dae83f14b..0e114a720963 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr.go @@ -62,8 +62,8 @@ import ( "strconv" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/schema" ) // toBool converts value to bool. In case of error, returns false diff --git a/libbeat/common/schema/mapstrstr/mapstrstr_test.go b/libbeat/common/schema/mapstrstr/mapstrstr_test.go index 240c7db77ec2..486f8e968f68 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr_test.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" ) func TestConversions(t *testing.T) { diff --git a/libbeat/common/schema/options.go b/libbeat/common/schema/options.go index b7d365367008..0f8b7e28840a 100644 --- a/libbeat/common/schema/options.go +++ b/libbeat/common/schema/options.go @@ -20,7 +20,7 @@ package schema import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // DefaultApplyOptions are the default options for Apply() diff --git a/libbeat/common/schema/options_test.go b/libbeat/common/schema/options_test.go index 0e4271d7c219..ecc65ead7141 100644 --- a/libbeat/common/schema/options_test.go +++ b/libbeat/common/schema/options_test.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestApplyOptions(t *testing.T) { diff --git a/libbeat/common/schema/schema.go b/libbeat/common/schema/schema.go index fe9cd7945882..1df3388d39be 100644 --- a/libbeat/common/schema/schema.go +++ b/libbeat/common/schema/schema.go @@ -20,9 +20,9 @@ package schema import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Schema describes how a map[string]interface{} object can be parsed and converted into diff --git a/libbeat/common/schema/schema_test.go b/libbeat/common/schema/schema_test.go index 58299c3d5d20..3b6b453e8071 100644 --- a/libbeat/common/schema/schema_test.go +++ b/libbeat/common/schema/schema_test.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func nop(key string, data map[string]interface{}) (interface{}, error) { diff --git a/libbeat/common/seccomp/seccomp.go b/libbeat/common/seccomp/seccomp.go index 9971934a9f8f..e877fcbeab1c 100644 --- a/libbeat/common/seccomp/seccomp.go +++ b/libbeat/common/seccomp/seccomp.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/go-seccomp-bpf" ) diff --git a/libbeat/common/streambuf/net.go b/libbeat/common/streambuf/net.go index 10ed41336d31..d6db9d4337d6 100644 --- a/libbeat/common/streambuf/net.go +++ b/libbeat/common/streambuf/net.go @@ -20,7 +20,7 @@ package streambuf // read integers in network byte order import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Parse 8bit binary value from Buffer. diff --git a/libbeat/common/transport/tlscommon/ca_pinning_test.go b/libbeat/common/transport/tlscommon/ca_pinning_test.go index a9f95e5c6ac7..c188a20e63a6 100644 --- a/libbeat/common/transport/tlscommon/ca_pinning_test.go +++ b/libbeat/common/transport/tlscommon/ca_pinning_test.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ser int64 = 1 diff --git a/libbeat/common/transport/tlscommon/server_config.go b/libbeat/common/transport/tlscommon/server_config.go index 8e0e668faa8a..3cea793eaab6 100644 --- a/libbeat/common/transport/tlscommon/server_config.go +++ b/libbeat/common/transport/tlscommon/server_config.go @@ -22,7 +22,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ServerConfig defines the user configurable tls options for any TCP based service. diff --git a/libbeat/common/transport/tlscommon/tls.go b/libbeat/common/transport/tlscommon/tls.go index 43eb371cdb2a..4432af99e744 100644 --- a/libbeat/common/transport/tlscommon/tls.go +++ b/libbeat/common/transport/tlscommon/tls.go @@ -26,7 +26,7 @@ import ( "fmt" "io/ioutil" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // LoadCertificate will load a certificate from disk and return a tls.Certificate or error diff --git a/libbeat/common/transport/tlscommon/tls_config.go b/libbeat/common/transport/tlscommon/tls_config.go index 41c574bc078a..647f049c22bc 100644 --- a/libbeat/common/transport/tlscommon/tls_config.go +++ b/libbeat/common/transport/tlscommon/tls_config.go @@ -21,7 +21,7 @@ import ( "crypto/tls" "crypto/x509" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TLSConfig is the interface used to configure a tcp client or server from a `Config` diff --git a/libbeat/common/transport/tlscommon/tls_test.go b/libbeat/common/transport/tlscommon/tls_test.go index 33233c787c9d..94e74a49b920 100644 --- a/libbeat/common/transport/tlscommon/tls_test.go +++ b/libbeat/common/transport/tlscommon/tls_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // test TLS config loading diff --git a/libbeat/common/useragent/useragent.go b/libbeat/common/useragent/useragent.go index ee06e66b0958..f9b36f3fd4ee 100644 --- a/libbeat/common/useragent/useragent.go +++ b/libbeat/common/useragent/useragent.go @@ -21,7 +21,7 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/version" ) // UserAgent takes the capitalized name of the current beat and returns diff --git a/libbeat/conditions/and_test.go b/libbeat/conditions/and_test.go index 468080c2380d..74d3cf63e901 100644 --- a/libbeat/conditions/and_test.go +++ b/libbeat/conditions/and_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestANDCondition(t *testing.T) { diff --git a/libbeat/conditions/conditions.go b/libbeat/conditions/conditions.go index 9ddd39ac4fed..8a0c823564f9 100644 --- a/libbeat/conditions/conditions.go +++ b/libbeat/conditions/conditions.go @@ -20,8 +20,8 @@ package conditions import ( "errors" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) const logName = "conditions" diff --git a/libbeat/conditions/conditions_benchmarks_test.go b/libbeat/conditions/conditions_benchmarks_test.go index dddd3a086008..1ccfe400334a 100644 --- a/libbeat/conditions/conditions_benchmarks_test.go +++ b/libbeat/conditions/conditions_benchmarks_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func BenchmarkSimpleCondition(b *testing.B) { diff --git a/libbeat/conditions/conditions_test.go b/libbeat/conditions/conditions_test.go index 3f91d2f3768d..0977fe313e1b 100644 --- a/libbeat/conditions/conditions_test.go +++ b/libbeat/conditions/conditions_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestCreateNilCondition(t *testing.T) { diff --git a/libbeat/conditions/equals.go b/libbeat/conditions/equals.go index 1cd176276763..6662e34ea635 100644 --- a/libbeat/conditions/equals.go +++ b/libbeat/conditions/equals.go @@ -20,7 +20,7 @@ package conditions import ( "fmt" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type equalsValue struct { diff --git a/libbeat/conditions/matcher.go b/libbeat/conditions/matcher.go index 788546af9a93..5a70df61cb61 100644 --- a/libbeat/conditions/matcher.go +++ b/libbeat/conditions/matcher.go @@ -20,8 +20,8 @@ package conditions import ( "fmt" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) type matcherMap map[string]match.Matcher diff --git a/libbeat/conditions/matcher_test.go b/libbeat/conditions/matcher_test.go index cd4986f175c7..13d144625945 100644 --- a/libbeat/conditions/matcher_test.go +++ b/libbeat/conditions/matcher_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestRegxpCreate(t *testing.T) { diff --git a/libbeat/conditions/network.go b/libbeat/conditions/network.go index 2b0b2df42b79..e5c732d469e1 100644 --- a/libbeat/conditions/network.go +++ b/libbeat/conditions/network.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/libbeat/conditions/network_test.go b/libbeat/conditions/network_test.go index 57676eca54dc..9effaf622661 100644 --- a/libbeat/conditions/network_test.go +++ b/libbeat/conditions/network_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNetworkConfigUnpack(t *testing.T) { diff --git a/libbeat/conditions/not_test.go b/libbeat/conditions/not_test.go index bc8c6f494058..f3a4fe715a5a 100644 --- a/libbeat/conditions/not_test.go +++ b/libbeat/conditions/not_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestNOTCondition(t *testing.T) { diff --git a/libbeat/conditions/or_test.go b/libbeat/conditions/or_test.go index e09fd903bf43..26ddef3cf1a4 100644 --- a/libbeat/conditions/or_test.go +++ b/libbeat/conditions/or_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestORCondition(t *testing.T) { diff --git a/libbeat/conditions/range.go b/libbeat/conditions/range.go index 4ab7bb90d76d..063a98e3152d 100644 --- a/libbeat/conditions/range.go +++ b/libbeat/conditions/range.go @@ -22,8 +22,8 @@ import ( "reflect" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type rangeValue struct { diff --git a/libbeat/conditions/range_test.go b/libbeat/conditions/range_test.go index 4ac99dc01e04..311df2115809 100644 --- a/libbeat/conditions/range_test.go +++ b/libbeat/conditions/range_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRangeCreateNumeric(t *testing.T) { diff --git a/libbeat/dashboards/dashboards.go b/libbeat/dashboards/dashboards.go index c1ba0ca9b1c4..8049d114dac8 100644 --- a/libbeat/dashboards/dashboards.go +++ b/libbeat/dashboards/dashboards.go @@ -25,8 +25,8 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // ImportDashboards tries to import the kibana dashboards. diff --git a/libbeat/dashboards/decode.go b/libbeat/dashboards/decode.go index 2b659d7251eb..8a0235e38943 100644 --- a/libbeat/dashboards/decode.go +++ b/libbeat/dashboards/decode.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/libbeat/dashboards/export.go b/libbeat/dashboards/export.go index 4e9a91309be8..4bd6ed826f22 100644 --- a/libbeat/dashboards/export.go +++ b/libbeat/dashboards/export.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" ) const ( diff --git a/libbeat/dashboards/importer.go b/libbeat/dashboards/importer.go index 40d0e68a22e2..eb399ba1b3d8 100644 --- a/libbeat/dashboards/importer.go +++ b/libbeat/dashboards/importer.go @@ -31,7 +31,7 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ErrNotFound returned when we cannot find any dashboard to import. diff --git a/libbeat/dashboards/kibana_loader.go b/libbeat/dashboards/kibana_loader.go index ca7dd345f15b..93dd0e5dc0e3 100644 --- a/libbeat/dashboards/kibana_loader.go +++ b/libbeat/dashboards/kibana_loader.go @@ -25,9 +25,9 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/logp" ) var importAPI = "/api/kibana/dashboards/import" diff --git a/libbeat/dashboards/modify_json.go b/libbeat/dashboards/modify_json.go index f844a0bb19bc..c8b1c79da6b0 100644 --- a/libbeat/dashboards/modify_json.go +++ b/libbeat/dashboards/modify_json.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type JSONObjectAttribute struct { diff --git a/libbeat/dashboards/modify_json_test.go b/libbeat/dashboards/modify_json_test.go index d7e54827ba85..08fedac4df33 100644 --- a/libbeat/dashboards/modify_json_test.go +++ b/libbeat/dashboards/modify_json_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReplaceStringInDashboard(t *testing.T) { diff --git a/libbeat/feature/registry.go b/libbeat/feature/registry.go index 77d829ac994d..2449654152af 100644 --- a/libbeat/feature/registry.go +++ b/libbeat/feature/registry.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type mapper map[string]map[string]Featurable diff --git a/libbeat/idxmgmt/client_handler.go b/libbeat/idxmgmt/client_handler.go index 9feba65ebd78..ee5b3e22c861 100644 --- a/libbeat/idxmgmt/client_handler.go +++ b/libbeat/idxmgmt/client_handler.go @@ -18,9 +18,9 @@ package idxmgmt import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/template" ) // ClientHandler defines the interface between a remote service and the Manager for ILM and templates. diff --git a/libbeat/idxmgmt/idxmgmt.go b/libbeat/idxmgmt/idxmgmt.go index 6837af03d13d..c6e67cc7540e 100644 --- a/libbeat/idxmgmt/idxmgmt.go +++ b/libbeat/idxmgmt/idxmgmt.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/template" ) // SupportFactory is used to provide custom index management support to libbeat. diff --git a/libbeat/idxmgmt/ilm/client_handler.go b/libbeat/idxmgmt/ilm/client_handler.go index df5ca22a0542..12b739c99467 100644 --- a/libbeat/idxmgmt/ilm/client_handler.go +++ b/libbeat/idxmgmt/ilm/client_handler.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ClientHandler defines the interface between a remote service and the Manager. diff --git a/libbeat/idxmgmt/ilm/client_handler_integration_test.go b/libbeat/idxmgmt/ilm/client_handler_integration_test.go index a9333ba6adce..2d9c2ca721e5 100644 --- a/libbeat/idxmgmt/ilm/client_handler_integration_test.go +++ b/libbeat/idxmgmt/ilm/client_handler_integration_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/version" ) const ( diff --git a/libbeat/idxmgmt/ilm/config.go b/libbeat/idxmgmt/ilm/config.go index 3697d808f4e7..de78cdbce551 100644 --- a/libbeat/idxmgmt/ilm/config.go +++ b/libbeat/idxmgmt/ilm/config.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) // Config is used for unpacking a common.Config. diff --git a/libbeat/idxmgmt/ilm/ilm.go b/libbeat/idxmgmt/ilm/ilm.go index d9f6bbe6a06e..ac87161c481c 100644 --- a/libbeat/idxmgmt/ilm/ilm.go +++ b/libbeat/idxmgmt/ilm/ilm.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" ) // SupportFactory is used to define a policy type to be used. diff --git a/libbeat/idxmgmt/ilm/ilm_test.go b/libbeat/idxmgmt/ilm/ilm_test.go index cc751d2bd4b5..e47a9c0d06bc 100644 --- a/libbeat/idxmgmt/ilm/ilm_test.go +++ b/libbeat/idxmgmt/ilm/ilm_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDefaultSupport_Init(t *testing.T) { diff --git a/libbeat/idxmgmt/ilm/noop.go b/libbeat/idxmgmt/ilm/noop.go index 7acbafbb645b..b516acf8aceb 100644 --- a/libbeat/idxmgmt/ilm/noop.go +++ b/libbeat/idxmgmt/ilm/noop.go @@ -18,8 +18,8 @@ package ilm import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type noopSupport struct{} diff --git a/libbeat/idxmgmt/ilm/std.go b/libbeat/idxmgmt/ilm/std.go index fbb497857f91..0e33fc00f3ed 100644 --- a/libbeat/idxmgmt/ilm/std.go +++ b/libbeat/idxmgmt/ilm/std.go @@ -20,7 +20,7 @@ package ilm import ( "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type stdSupport struct { diff --git a/libbeat/idxmgmt/mockilm_test.go b/libbeat/idxmgmt/mockilm_test.go index a36e17bd4211..6022ad843b42 100644 --- a/libbeat/idxmgmt/mockilm_test.go +++ b/libbeat/idxmgmt/mockilm_test.go @@ -20,10 +20,10 @@ package idxmgmt import ( "github.com/stretchr/testify/mock" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" ) type mockILMSupport struct { diff --git a/libbeat/idxmgmt/std.go b/libbeat/idxmgmt/std.go index bb961712436e..a6aff9af9d34 100644 --- a/libbeat/idxmgmt/std.go +++ b/libbeat/idxmgmt/std.go @@ -21,14 +21,14 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/template" ) type indexSupport struct { diff --git a/libbeat/idxmgmt/std_test.go b/libbeat/idxmgmt/std_test.go index b3ba0b123edf..ea23a53fd848 100644 --- a/libbeat/idxmgmt/std_test.go +++ b/libbeat/idxmgmt/std_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/template" ) type mockClientHandler struct { diff --git a/libbeat/keystore/file_keystore.go b/libbeat/keystore/file_keystore.go index 357002cb1510..36a21359043e 100644 --- a/libbeat/keystore/file_keystore.go +++ b/libbeat/keystore/file_keystore.go @@ -34,8 +34,8 @@ import ( "golang.org/x/crypto/pbkdf2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" ) const ( diff --git a/libbeat/keystore/file_keystore_test.go b/libbeat/keystore/file_keystore_test.go index 42eb36f2c4ed..5626a68d5911 100644 --- a/libbeat/keystore/file_keystore_test.go +++ b/libbeat/keystore/file_keystore_test.go @@ -27,7 +27,7 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var keyValue = "output.elasticsearch.password" diff --git a/libbeat/keystore/keystore.go b/libbeat/keystore/keystore.go index 15937b5163e8..57f1cd707e8a 100644 --- a/libbeat/keystore/keystore.go +++ b/libbeat/keystore/keystore.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ucfg "github.com/elastic/go-ucfg" "github.com/elastic/go-ucfg/parse" ) diff --git a/libbeat/kibana/client.go b/libbeat/kibana/client.go index 174ef1113db1..85c7aac17a79 100644 --- a/libbeat/kibana/client.go +++ b/libbeat/kibana/client.go @@ -31,10 +31,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type Connection struct { diff --git a/libbeat/kibana/client_config.go b/libbeat/kibana/client_config.go index 3d55c6998bec..07897b9fad9a 100644 --- a/libbeat/kibana/client_config.go +++ b/libbeat/kibana/client_config.go @@ -20,7 +20,7 @@ package kibana import ( "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // ClientConfig to connect to Kibana diff --git a/libbeat/kibana/dashboard.go b/libbeat/kibana/dashboard.go index 6da7f39530cc..d5174b5b1a5a 100644 --- a/libbeat/kibana/dashboard.go +++ b/libbeat/kibana/dashboard.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // RemoveIndexPattern removes the index pattern entry from a given dashboard export diff --git a/libbeat/kibana/fields_transformer.go b/libbeat/kibana/fields_transformer.go index b5ffd82fa043..7009484e573f 100644 --- a/libbeat/kibana/fields_transformer.go +++ b/libbeat/kibana/fields_transformer.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var v640 = common.MustNewVersion("6.4.0") diff --git a/libbeat/kibana/fields_transformer_test.go b/libbeat/kibana/fields_transformer_test.go index be2fd6864fc9..fc7e9485536f 100644 --- a/libbeat/kibana/fields_transformer_test.go +++ b/libbeat/kibana/fields_transformer_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/kibana/index_pattern_generator.go b/libbeat/kibana/index_pattern_generator.go index 93b5406c2de0..abe8634c862b 100644 --- a/libbeat/kibana/index_pattern_generator.go +++ b/libbeat/kibana/index_pattern_generator.go @@ -24,8 +24,8 @@ import ( "path/filepath" "regexp" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) type IndexPatternGenerator struct { diff --git a/libbeat/kibana/index_pattern_generator_test.go b/libbeat/kibana/index_pattern_generator_test.go index 6d327c3e3cb3..f2a7c86784d6 100644 --- a/libbeat/kibana/index_pattern_generator_test.go +++ b/libbeat/kibana/index_pattern_generator_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const ( diff --git a/libbeat/kibana/transformer.go b/libbeat/kibana/transformer.go index f99dd5ff0c07..6e2b086e28bc 100644 --- a/libbeat/kibana/transformer.go +++ b/libbeat/kibana/transformer.go @@ -18,7 +18,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg/yaml" ) diff --git a/libbeat/libbeat.go b/libbeat/libbeat.go index 03327a00ec1c..70ebf26a5160 100644 --- a/libbeat/libbeat.go +++ b/libbeat/libbeat.go @@ -20,8 +20,8 @@ package main import ( "os" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/mock" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/mock" ) var RootCmd = cmd.GenRootCmdWithSettings(mock.New, mock.Settings) diff --git a/libbeat/libbeat_test.go b/libbeat/libbeat_test.go index b45fca1d7d20..d1d06506c87e 100644 --- a/libbeat/libbeat_test.go +++ b/libbeat/libbeat_test.go @@ -21,7 +21,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/libbeat/logp/configure/logging.go b/libbeat/logp/configure/logging.go index be1a7c5c6ab3..6e4d60ece1f3 100644 --- a/libbeat/logp/configure/logging.go +++ b/libbeat/logp/configure/logging.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // CLI flags for configuring logging. diff --git a/libbeat/logp/core.go b/libbeat/logp/core.go index 5dd990714f41..b0204a62ac76 100644 --- a/libbeat/logp/core.go +++ b/libbeat/logp/core.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/magefile.go b/libbeat/magefile.go index eb5dfe022af1..ff168daec533 100644 --- a/libbeat/magefile.go +++ b/libbeat/magefile.go @@ -22,12 +22,12 @@ package main import ( "context" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" ) // Build builds the Beat binary. diff --git a/libbeat/management/management.go b/libbeat/management/management.go index 8299365bfe3e..fb6c89ba8706 100644 --- a/libbeat/management/management.go +++ b/libbeat/management/management.go @@ -20,9 +20,9 @@ package management import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/feature" ) // Namespace is the feature namespace for queue definition. diff --git a/libbeat/mapping/field_test.go b/libbeat/mapping/field_test.go index 6d2bfe49551e..0236ac4a6ae5 100644 --- a/libbeat/mapping/field_test.go +++ b/libbeat/mapping/field_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg/yaml" ) diff --git a/libbeat/metric/system/cpu/cpu.go b/libbeat/metric/system/cpu/cpu.go index b5cb6981fb87..abf274ff066c 100644 --- a/libbeat/metric/system/cpu/cpu.go +++ b/libbeat/metric/system/cpu/cpu.go @@ -22,7 +22,7 @@ package cpu import ( "runtime" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" sigar "github.com/elastic/gosigar" ) diff --git a/libbeat/metric/system/host/host.go b/libbeat/metric/system/host/host.go index 25cfb814749c..0d143ed2499e 100644 --- a/libbeat/metric/system/host/host.go +++ b/libbeat/metric/system/host/host.go @@ -18,8 +18,8 @@ package host import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/metric/system/memory/memory.go b/libbeat/metric/system/memory/memory.go index d2833d4b092c..9351ac08e9e5 100644 --- a/libbeat/metric/system/memory/memory.go +++ b/libbeat/metric/system/memory/memory.go @@ -22,8 +22,8 @@ package memory import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" sysinfo "github.com/elastic/go-sysinfo" sysinfotypes "github.com/elastic/go-sysinfo/types" sigar "github.com/elastic/gosigar" diff --git a/libbeat/metric/system/process/process.go b/libbeat/metric/system/process/process.go index 544bacc7ec6d..7c5d70ebbc69 100644 --- a/libbeat/metric/system/process/process.go +++ b/libbeat/metric/system/process/process.go @@ -29,10 +29,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/memory" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/memory" sigar "github.com/elastic/gosigar" ) diff --git a/libbeat/metric/system/process/process_test.go b/libbeat/metric/system/process/process_test.go index 23b19610417b..527f6030716a 100644 --- a/libbeat/metric/system/process/process_test.go +++ b/libbeat/metric/system/process/process_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/gosigar" ) diff --git a/libbeat/ml-importer/importer.go b/libbeat/ml-importer/importer.go index 61f65909e5c7..00358084263f 100644 --- a/libbeat/ml-importer/importer.go +++ b/libbeat/ml-importer/importer.go @@ -30,8 +30,8 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/libbeat/ml-importer/importer_integration_test.go b/libbeat/ml-importer/importer_integration_test.go index a27ffd51fad8..17cc7d02190f 100644 --- a/libbeat/ml-importer/importer_integration_test.go +++ b/libbeat/ml-importer/importer_integration_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/estest" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/estest" ) const sampleJob = ` diff --git a/libbeat/mock/mockbeat.go b/libbeat/mock/mockbeat.go index 4a7dd1e01542..6224534c03be 100644 --- a/libbeat/mock/mockbeat.go +++ b/libbeat/mock/mockbeat.go @@ -20,10 +20,10 @@ package mock import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) ///*** Mock Beat Setup ***/// diff --git a/libbeat/monitoring/adapter/filters.go b/libbeat/monitoring/adapter/filters.go index c596a7f8763c..9d0f68e933b6 100644 --- a/libbeat/monitoring/adapter/filters.go +++ b/libbeat/monitoring/adapter/filters.go @@ -20,8 +20,8 @@ package adapter import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // provide filters for filtering and adapting a metric type diff --git a/libbeat/monitoring/adapter/go-metrics-wrapper.go b/libbeat/monitoring/adapter/go-metrics-wrapper.go index 815bc1284870..20f3714aa04d 100644 --- a/libbeat/monitoring/adapter/go-metrics-wrapper.go +++ b/libbeat/monitoring/adapter/go-metrics-wrapper.go @@ -20,7 +20,7 @@ package adapter import ( metrics "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // go-metrics wrapper interface required to unpack the original metric diff --git a/libbeat/monitoring/adapter/go-metrics.go b/libbeat/monitoring/adapter/go-metrics.go index 69b043687971..27fbfbf4aff0 100644 --- a/libbeat/monitoring/adapter/go-metrics.go +++ b/libbeat/monitoring/adapter/go-metrics.go @@ -24,8 +24,8 @@ import ( metrics "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // implement adapter for adding go-metrics based counters diff --git a/libbeat/monitoring/adapter/go-metrics_test.go b/libbeat/monitoring/adapter/go-metrics_test.go index 07aaf0e4a81b..1715b6c69fbe 100644 --- a/libbeat/monitoring/adapter/go-metrics_test.go +++ b/libbeat/monitoring/adapter/go-metrics_test.go @@ -24,7 +24,7 @@ import ( metrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func TestGoMetricsAdapter(t *testing.T) { diff --git a/libbeat/monitoring/cloudid.go b/libbeat/monitoring/cloudid.go index 73e08bed4574..d6a53f7bc143 100644 --- a/libbeat/monitoring/cloudid.go +++ b/libbeat/monitoring/cloudid.go @@ -22,8 +22,8 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cloudid" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/cloudid" + "github.com/elastic/beats/v7/libbeat/common" ) type cloudConfig struct { diff --git a/libbeat/monitoring/cloudid_test.go b/libbeat/monitoring/cloudid_test.go index 0ac5acf13140..d9935fbb67bd 100644 --- a/libbeat/monitoring/cloudid_test.go +++ b/libbeat/monitoring/cloudid_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestOverrideWithCloudSettings(t *testing.T) { diff --git a/libbeat/monitoring/metrics.go b/libbeat/monitoring/metrics.go index 364ee6b21e5a..22ad0482b1d2 100644 --- a/libbeat/monitoring/metrics.go +++ b/libbeat/monitoring/metrics.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) // makeExpvar wraps a callback for registering a metrics with expvar.Publish. diff --git a/libbeat/monitoring/monitoring.go b/libbeat/monitoring/monitoring.go index 48b854a773e7..04014b818cb4 100644 --- a/libbeat/monitoring/monitoring.go +++ b/libbeat/monitoring/monitoring.go @@ -20,9 +20,9 @@ package monitoring import ( "errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // BeatConfig represents the part of the $BEAT.yml to do with monitoring settings diff --git a/libbeat/monitoring/report/elasticsearch/client.go b/libbeat/monitoring/report/elasticsearch/client.go index 6f47c6b62095..ca3aeda9566b 100644 --- a/libbeat/monitoring/report/elasticsearch/client.go +++ b/libbeat/monitoring/report/elasticsearch/client.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring/report" - esout "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + esout "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) var createDocPrivAvailableESVersion = common.MustNewVersion("7.5.0") diff --git a/libbeat/monitoring/report/elasticsearch/config.go b/libbeat/monitoring/report/elasticsearch/config.go index 4f355e270054..a603c73788bd 100644 --- a/libbeat/monitoring/report/elasticsearch/config.go +++ b/libbeat/monitoring/report/elasticsearch/config.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // config is subset of libbeat/outputs/elasticsearch config tailored diff --git a/libbeat/monitoring/report/elasticsearch/elasticsearch.go b/libbeat/monitoring/report/elasticsearch/elasticsearch.go index 965c13da6577..391abc4ae6ce 100644 --- a/libbeat/monitoring/report/elasticsearch/elasticsearch.go +++ b/libbeat/monitoring/report/elasticsearch/elasticsearch.go @@ -27,20 +27,20 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/outputs" - esout "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/outputs" + esout "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" ) type reporter struct { diff --git a/libbeat/monitoring/report/elasticsearch/snapshot.go b/libbeat/monitoring/report/elasticsearch/snapshot.go index 62766174c2a4..72c4c69fb790 100644 --- a/libbeat/monitoring/report/elasticsearch/snapshot.go +++ b/libbeat/monitoring/report/elasticsearch/snapshot.go @@ -18,8 +18,8 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func makeSnapshot(R *monitoring.Registry) common.MapStr { diff --git a/libbeat/monitoring/report/event.go b/libbeat/monitoring/report/event.go index bdcab64ccc08..f7d1e923c1be 100644 --- a/libbeat/monitoring/report/event.go +++ b/libbeat/monitoring/report/event.go @@ -20,7 +20,7 @@ package report import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Event is the format of monitoring events. diff --git a/libbeat/monitoring/report/log/log.go b/libbeat/monitoring/report/log/log.go index bd6bf9e43cc2..2e8ef566bcfd 100644 --- a/libbeat/monitoring/report/log/log.go +++ b/libbeat/monitoring/report/log/log.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // List of metrics that are gauges. This is used to identify metrics that should diff --git a/libbeat/monitoring/report/log/log_test.go b/libbeat/monitoring/report/log/log_test.go index 3d7091d781c2..4d0e215d6c8c 100644 --- a/libbeat/monitoring/report/log/log_test.go +++ b/libbeat/monitoring/report/log/log_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/libbeat/monitoring/report/report.go b/libbeat/monitoring/report/report.go index 1b05b85bb49e..e6812515af97 100644 --- a/libbeat/monitoring/report/report.go +++ b/libbeat/monitoring/report/report.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Format encodes the type of format to report monitoring data in. This diff --git a/libbeat/outputs/backoff.go b/libbeat/outputs/backoff.go index dca02fc88fc5..256b8029b099 100644 --- a/libbeat/outputs/backoff.go +++ b/libbeat/outputs/backoff.go @@ -21,9 +21,9 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type backoffClient struct { diff --git a/libbeat/outputs/codec/codec.go b/libbeat/outputs/codec/codec.go index 790611ddaea6..347738d9c5a3 100644 --- a/libbeat/outputs/codec/codec.go +++ b/libbeat/outputs/codec/codec.go @@ -17,7 +17,7 @@ package codec -import "github.com/elastic/beats/libbeat/beat" +import "github.com/elastic/beats/v7/libbeat/beat" type Codec interface { Encode(index string, event *beat.Event) ([]byte, error) diff --git a/libbeat/outputs/codec/codec_reg.go b/libbeat/outputs/codec/codec_reg.go index 7db8aee58f21..b4468bba9328 100644 --- a/libbeat/outputs/codec/codec_reg.go +++ b/libbeat/outputs/codec/codec_reg.go @@ -20,8 +20,8 @@ package codec import ( "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type Factory func(beat.Info, *common.Config) (Codec, error) diff --git a/libbeat/outputs/codec/common.go b/libbeat/outputs/codec/common.go index d3df85dc5346..296e0aff3896 100644 --- a/libbeat/outputs/codec/common.go +++ b/libbeat/outputs/codec/common.go @@ -20,8 +20,8 @@ package codec import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/dtfmt" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/dtfmt" "github.com/elastic/go-structform" ) diff --git a/libbeat/outputs/codec/format/format.go b/libbeat/outputs/codec/format/format.go index 0416222dc2e0..1be9268fa3d1 100644 --- a/libbeat/outputs/codec/format/format.go +++ b/libbeat/outputs/codec/format/format.go @@ -20,10 +20,10 @@ package format import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type Encoder struct { diff --git a/libbeat/outputs/codec/format/format_test.go b/libbeat/outputs/codec/format/format_test.go index 191ee5520064..96ded4f78410 100644 --- a/libbeat/outputs/codec/format/format_test.go +++ b/libbeat/outputs/codec/format/format_test.go @@ -20,9 +20,9 @@ package format import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) func TestFormatStringWriter(t *testing.T) { diff --git a/libbeat/outputs/codec/json/event.go b/libbeat/outputs/codec/json/event.go index 2f0d2c1217b0..c966df28f5f9 100644 --- a/libbeat/outputs/codec/json/event.go +++ b/libbeat/outputs/codec/json/event.go @@ -20,8 +20,8 @@ package json import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Event describes the event structure for events diff --git a/libbeat/outputs/codec/json/json.go b/libbeat/outputs/codec/json/json.go index 45b875b3ba9f..01d4f324104e 100644 --- a/libbeat/outputs/codec/json/json.go +++ b/libbeat/outputs/codec/json/json.go @@ -21,9 +21,9 @@ import ( "bytes" stdjson "encoding/json" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" "github.com/elastic/go-structform/gotype" "github.com/elastic/go-structform/json" ) diff --git a/libbeat/outputs/codec/json/json_bench_test.go b/libbeat/outputs/codec/json/json_bench_test.go index 8d60362b3d5e..dbdde0fa33e5 100644 --- a/libbeat/outputs/codec/json/json_bench_test.go +++ b/libbeat/outputs/codec/json/json_bench_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var result []byte diff --git a/libbeat/outputs/codec/json/json_test.go b/libbeat/outputs/codec/json/json_test.go index dc01e397e0bd..be2381e38c46 100644 --- a/libbeat/outputs/codec/json/json_test.go +++ b/libbeat/outputs/codec/json/json_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestJsonCodec(t *testing.T) { diff --git a/libbeat/outputs/codec/plugin.go b/libbeat/outputs/codec/plugin.go index 951bae242c09..b99ba36e7ca0 100644 --- a/libbeat/outputs/codec/plugin.go +++ b/libbeat/outputs/codec/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" ) type codecPlugin struct { diff --git a/libbeat/outputs/console/config.go b/libbeat/outputs/console/config.go index 09debf38aa84..44869e388fa9 100644 --- a/libbeat/outputs/console/config.go +++ b/libbeat/outputs/console/config.go @@ -17,7 +17,7 @@ package console -import "github.com/elastic/beats/libbeat/outputs/codec" +import "github.com/elastic/beats/v7/libbeat/outputs/codec" type Config struct { Codec codec.Config `config:"codec"` diff --git a/libbeat/outputs/console/console.go b/libbeat/outputs/console/console.go index c91d420674dd..3df69f4e5ba2 100644 --- a/libbeat/outputs/console/console.go +++ b/libbeat/outputs/console/console.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/publisher" ) type console struct { diff --git a/libbeat/outputs/console/console_test.go b/libbeat/outputs/console/console_test.go index 46c655094ab0..29201beee54c 100644 --- a/libbeat/outputs/console/console_test.go +++ b/libbeat/outputs/console/console_test.go @@ -27,15 +27,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/format" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/publisher" ) // capture stdout and return captured string diff --git a/libbeat/outputs/elasticsearch/api.go b/libbeat/outputs/elasticsearch/api.go index 91c15cf2a468..d267fb6a98af 100644 --- a/libbeat/outputs/elasticsearch/api.go +++ b/libbeat/outputs/elasticsearch/api.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // QueryResult contains the result of a query. diff --git a/libbeat/outputs/elasticsearch/api_integration_test.go b/libbeat/outputs/elasticsearch/api_integration_test.go index 44c463650121..787cb7a6a429 100644 --- a/libbeat/outputs/elasticsearch/api_integration_test.go +++ b/libbeat/outputs/elasticsearch/api_integration_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestIndex(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/api_mock_test.go b/libbeat/outputs/elasticsearch/api_mock_test.go index 2cd92546fd06..65e687548332 100644 --- a/libbeat/outputs/elasticsearch/api_mock_test.go +++ b/libbeat/outputs/elasticsearch/api_mock_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func ElasticsearchMock(code int, body []byte) *httptest.Server { diff --git a/libbeat/outputs/elasticsearch/api_test.go b/libbeat/outputs/elasticsearch/api_test.go index 9ddff5405372..73eaa7708cc4 100644 --- a/libbeat/outputs/elasticsearch/api_test.go +++ b/libbeat/outputs/elasticsearch/api_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func GetValidQueryResult() QueryResult { diff --git a/libbeat/outputs/elasticsearch/bulkapi.go b/libbeat/outputs/elasticsearch/bulkapi.go index 48c174624306..1eccdb235bce 100644 --- a/libbeat/outputs/elasticsearch/bulkapi.go +++ b/libbeat/outputs/elasticsearch/bulkapi.go @@ -25,7 +25,7 @@ import ( "net/http" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // MetaBuilder creates meta data for bulk requests diff --git a/libbeat/outputs/elasticsearch/bulkapi_integration_test.go b/libbeat/outputs/elasticsearch/bulkapi_integration_test.go index 704361c1edf6..7599a407f49c 100644 --- a/libbeat/outputs/elasticsearch/bulkapi_integration_test.go +++ b/libbeat/outputs/elasticsearch/bulkapi_integration_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestBulk(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/bulkapi_mock_test.go b/libbeat/outputs/elasticsearch/bulkapi_mock_test.go index ca927db61c41..a87d0d1046c7 100644 --- a/libbeat/outputs/elasticsearch/bulkapi_mock_test.go +++ b/libbeat/outputs/elasticsearch/bulkapi_mock_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestOneHostSuccessResp_Bulk(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/client.go b/libbeat/outputs/elasticsearch/client.go index 5c3a1bc7b487..9838f355dd55 100644 --- a/libbeat/outputs/elasticsearch/client.go +++ b/libbeat/outputs/elasticsearch/client.go @@ -29,14 +29,14 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) // Client is an elasticsearch client. diff --git a/libbeat/outputs/elasticsearch/client_integration_test.go b/libbeat/outputs/elasticsearch/client_integration_test.go index b3d2a96d7e70..fb4c62cb86fa 100644 --- a/libbeat/outputs/elasticsearch/client_integration_test.go +++ b/libbeat/outputs/elasticsearch/client_integration_test.go @@ -33,14 +33,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/internal" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/internal" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func TestClientConnect(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/client_proxy_test.go b/libbeat/outputs/elasticsearch/client_proxy_test.go index 3521a5868e0a..4d57f87fb783 100644 --- a/libbeat/outputs/elasticsearch/client_proxy_test.go +++ b/libbeat/outputs/elasticsearch/client_proxy_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) // These constants are inserted into client http request headers and confirmed diff --git a/libbeat/outputs/elasticsearch/client_test.go b/libbeat/outputs/elasticsearch/client_test.go index 72ad6ee22f9c..7a0ac0e68245 100644 --- a/libbeat/outputs/elasticsearch/client_test.go +++ b/libbeat/outputs/elasticsearch/client_test.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/version" ) func readStatusItem(in []byte) (int, string, error) { diff --git a/libbeat/outputs/elasticsearch/config.go b/libbeat/outputs/elasticsearch/config.go index 8178d015b108..4cbf449b6ecb 100644 --- a/libbeat/outputs/elasticsearch/config.go +++ b/libbeat/outputs/elasticsearch/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) type elasticsearchConfig struct { diff --git a/libbeat/outputs/elasticsearch/elasticsearch.go b/libbeat/outputs/elasticsearch/elasticsearch.go index 55ef6e82a2c6..0cdad25cbe88 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch.go +++ b/libbeat/outputs/elasticsearch/elasticsearch.go @@ -25,12 +25,12 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func init() { diff --git a/libbeat/outputs/elasticsearch/enc.go b/libbeat/outputs/elasticsearch/enc.go index 11d43c8c4797..8d2497e51829 100644 --- a/libbeat/outputs/elasticsearch/enc.go +++ b/libbeat/outputs/elasticsearch/enc.go @@ -24,9 +24,9 @@ import ( "net/http" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" "github.com/elastic/go-structform/gotype" "github.com/elastic/go-structform/json" ) diff --git a/libbeat/outputs/elasticsearch/enc_test.go b/libbeat/outputs/elasticsearch/enc_test.go index 135bdf0d5f58..0ccea8cd0f40 100644 --- a/libbeat/outputs/elasticsearch/enc_test.go +++ b/libbeat/outputs/elasticsearch/enc_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) func TestJSONEncoderMarshalBeatEvent(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/estest/estest.go b/libbeat/outputs/elasticsearch/estest/estest.go index b5334edd5251..3aafc7da0d7f 100644 --- a/libbeat/outputs/elasticsearch/estest/estest.go +++ b/libbeat/outputs/elasticsearch/estest/estest.go @@ -20,9 +20,9 @@ package estest import ( "time" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/internal" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/internal" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) // GetTestingElasticsearch creates a test client. diff --git a/libbeat/outputs/elasticsearch/json_read.go b/libbeat/outputs/elasticsearch/json_read.go index 896ec89f2fae..8df87e5cb431 100644 --- a/libbeat/outputs/elasticsearch/json_read.go +++ b/libbeat/outputs/elasticsearch/json_read.go @@ -20,7 +20,7 @@ package elasticsearch import ( "errors" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) // SAX like json parser. But instead of relying on callbacks, state machine diff --git a/libbeat/outputs/failover.go b/libbeat/outputs/failover.go index 99d379a39436..b388a58a61f0 100644 --- a/libbeat/outputs/failover.go +++ b/libbeat/outputs/failover.go @@ -23,8 +23,8 @@ import ( "math/rand" "strings" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type failoverClient struct { diff --git a/libbeat/outputs/fileout/config.go b/libbeat/outputs/fileout/config.go index 742334ceed0b..4b83cdbab971 100644 --- a/libbeat/outputs/fileout/config.go +++ b/libbeat/outputs/fileout/config.go @@ -20,8 +20,8 @@ package fileout import ( "fmt" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type config struct { diff --git a/libbeat/outputs/fileout/file.go b/libbeat/outputs/fileout/file.go index ab5b040bea59..5080f9b87e88 100644 --- a/libbeat/outputs/fileout/file.go +++ b/libbeat/outputs/fileout/file.go @@ -21,13 +21,13 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/publisher" ) func init() { diff --git a/libbeat/outputs/hosts.go b/libbeat/outputs/hosts.go index f8b192dba386..2ece4fc3ab8e 100644 --- a/libbeat/outputs/hosts.go +++ b/libbeat/outputs/hosts.go @@ -17,7 +17,7 @@ package outputs -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // ReadHostList reads a list of hosts to connect to from an configuration // object. If the `workers` settings is > 1, each host is duplicated in the final diff --git a/libbeat/outputs/kafka/client.go b/libbeat/outputs/kafka/client.go index 8de05ef6077d..af428b518add 100644 --- a/libbeat/outputs/kafka/client.go +++ b/libbeat/outputs/kafka/client.go @@ -26,14 +26,14 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type client struct { diff --git a/libbeat/outputs/kafka/config.go b/libbeat/outputs/kafka/config.go index d394dd35a3ee..476d96fb38a3 100644 --- a/libbeat/outputs/kafka/config.go +++ b/libbeat/outputs/kafka/config.go @@ -25,15 +25,15 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type kafkaConfig struct { diff --git a/libbeat/outputs/kafka/config_test.go b/libbeat/outputs/kafka/config_test.go index dd74b50ed3d7..ee404666e142 100644 --- a/libbeat/outputs/kafka/config_test.go +++ b/libbeat/outputs/kafka/config_test.go @@ -20,7 +20,7 @@ package kafka import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigAcceptValid(t *testing.T) { diff --git a/libbeat/outputs/kafka/kafka.go b/libbeat/outputs/kafka/kafka.go index 37c478569467..a84d9790b2b8 100644 --- a/libbeat/outputs/kafka/kafka.go +++ b/libbeat/outputs/kafka/kafka.go @@ -23,12 +23,12 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) const ( diff --git a/libbeat/outputs/kafka/kafka_integration_test.go b/libbeat/outputs/kafka/kafka_integration_test.go index 771a402f8d24..58d03d1c1e70 100644 --- a/libbeat/outputs/kafka/kafka_integration_test.go +++ b/libbeat/outputs/kafka/kafka_integration_test.go @@ -32,14 +32,14 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/outputs/outest" ) const ( diff --git a/libbeat/outputs/kafka/log.go b/libbeat/outputs/kafka/log.go index 027f476406ba..11da0e377afc 100644 --- a/libbeat/outputs/kafka/log.go +++ b/libbeat/outputs/kafka/log.go @@ -20,7 +20,7 @@ package kafka import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type kafkaLogger struct{} diff --git a/libbeat/outputs/kafka/message.go b/libbeat/outputs/kafka/message.go index 7254c3908338..16f169b8bd19 100644 --- a/libbeat/outputs/kafka/message.go +++ b/libbeat/outputs/kafka/message.go @@ -22,7 +22,7 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) type message struct { diff --git a/libbeat/outputs/kafka/partition.go b/libbeat/outputs/kafka/partition.go index f903becdbf38..399c6d9de96b 100644 --- a/libbeat/outputs/kafka/partition.go +++ b/libbeat/outputs/kafka/partition.go @@ -28,8 +28,8 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type partitionBuilder func(*common.Config) (func() partitioner, error) diff --git a/libbeat/outputs/kafka/partition_test.go b/libbeat/outputs/kafka/partition_test.go index fed71a283fc0..67ea36444e7e 100644 --- a/libbeat/outputs/kafka/partition_test.go +++ b/libbeat/outputs/kafka/partition_test.go @@ -28,9 +28,9 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) type partTestScenario func(*testing.T, bool, sarama.Partitioner) error diff --git a/libbeat/outputs/logstash/async.go b/libbeat/outputs/logstash/async.go index 967ae7d0f6c1..b3357f725893 100644 --- a/libbeat/outputs/logstash/async.go +++ b/libbeat/outputs/logstash/async.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" v2 "github.com/elastic/go-lumber/client/v2" ) diff --git a/libbeat/outputs/logstash/async_test.go b/libbeat/outputs/logstash/async_test.go index b99fb9a57491..fb70962d3b97 100644 --- a/libbeat/outputs/logstash/async_test.go +++ b/libbeat/outputs/logstash/async_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type testAsyncDriver struct { diff --git a/libbeat/outputs/logstash/client_test.go b/libbeat/outputs/logstash/client_test.go index 30e98fd83094..87cf8e50f436 100644 --- a/libbeat/outputs/logstash/client_test.go +++ b/libbeat/outputs/logstash/client_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" v2 "github.com/elastic/go-lumber/server/v2" ) diff --git a/libbeat/outputs/logstash/common_test.go b/libbeat/outputs/logstash/common_test.go index 47ae55088fde..75f2aa15e560 100644 --- a/libbeat/outputs/logstash/common_test.go +++ b/libbeat/outputs/logstash/common_test.go @@ -18,7 +18,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func enableLogging(selectors []string) { diff --git a/libbeat/outputs/logstash/config.go b/libbeat/outputs/logstash/config.go index 6d2a30d39ea6..be6ad1a4f4a5 100644 --- a/libbeat/outputs/logstash/config.go +++ b/libbeat/outputs/logstash/config.go @@ -21,12 +21,12 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type Config struct { diff --git a/libbeat/outputs/logstash/config_test.go b/libbeat/outputs/logstash/config_test.go index ee3ffe179786..572749bc1a3e 100644 --- a/libbeat/outputs/logstash/config_test.go +++ b/libbeat/outputs/logstash/config_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/outputs/logstash/enc.go b/libbeat/outputs/logstash/enc.go index fb42626ec5cd..747a7d3fd5be 100644 --- a/libbeat/outputs/logstash/enc.go +++ b/libbeat/outputs/logstash/enc.go @@ -20,8 +20,8 @@ package logstash import ( "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" ) func makeLogstashEventEncoder(info beat.Info, escapeHTML bool, index string) func(interface{}) ([]byte, error) { diff --git a/libbeat/outputs/logstash/logstash.go b/libbeat/outputs/logstash/logstash.go index d1a64a47b269..b2c3bb95565b 100644 --- a/libbeat/outputs/logstash/logstash.go +++ b/libbeat/outputs/logstash/logstash.go @@ -18,12 +18,12 @@ package logstash import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) const ( diff --git a/libbeat/outputs/logstash/logstash_integration_test.go b/libbeat/outputs/logstash/logstash_integration_test.go index e6800766b331..2b5a0dbfc9b9 100644 --- a/libbeat/outputs/logstash/logstash_integration_test.go +++ b/libbeat/outputs/logstash/logstash_integration_test.go @@ -29,14 +29,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) const ( diff --git a/libbeat/outputs/logstash/logstash_test.go b/libbeat/outputs/logstash/logstash_test.go index e51ae1cdb34c..911e6e22129e 100644 --- a/libbeat/outputs/logstash/logstash_test.go +++ b/libbeat/outputs/logstash/logstash_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" v2 "github.com/elastic/go-lumber/server/v2" ) diff --git a/libbeat/outputs/logstash/sync.go b/libbeat/outputs/logstash/sync.go index 8b47ce691cad..cd37e0bbb317 100644 --- a/libbeat/outputs/logstash/sync.go +++ b/libbeat/outputs/logstash/sync.go @@ -20,11 +20,11 @@ package logstash import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" v2 "github.com/elastic/go-lumber/client/v2" ) diff --git a/libbeat/outputs/logstash/sync_test.go b/libbeat/outputs/logstash/sync_test.go index f9d74cb69cba..5b05c4d0ccc8 100644 --- a/libbeat/outputs/logstash/sync_test.go +++ b/libbeat/outputs/logstash/sync_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" ) type testSyncDriver struct { diff --git a/libbeat/outputs/metrics.go b/libbeat/outputs/metrics.go index 28ac20627da5..602506a1befc 100644 --- a/libbeat/outputs/metrics.go +++ b/libbeat/outputs/metrics.go @@ -17,7 +17,7 @@ package outputs -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" // Stats implements the Observer interface, for collecting metrics on common // outputs events. diff --git a/libbeat/outputs/outest/batch.go b/libbeat/outputs/outest/batch.go index 5cb16f5a830d..11d4bf1a2667 100644 --- a/libbeat/outputs/outest/batch.go +++ b/libbeat/outputs/outest/batch.go @@ -18,8 +18,8 @@ package outest import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/publisher" ) type Batch struct { diff --git a/libbeat/outputs/outil/select.go b/libbeat/outputs/outil/select.go index d06ee4e32091..6ff629c88e75 100644 --- a/libbeat/outputs/outil/select.go +++ b/libbeat/outputs/outil/select.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/conditions" ) // Selector is used to produce a string based on the contents of a Beats event. diff --git a/libbeat/outputs/outil/select_test.go b/libbeat/outputs/outil/select_test.go index f6e837966b2d..e16cb602a96d 100644 --- a/libbeat/outputs/outil/select_test.go +++ b/libbeat/outputs/outil/select_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type node map[string]interface{} diff --git a/libbeat/outputs/output_reg.go b/libbeat/outputs/output_reg.go index 6625f1125b1f..86c1323c505b 100644 --- a/libbeat/outputs/output_reg.go +++ b/libbeat/outputs/output_reg.go @@ -20,8 +20,8 @@ package outputs import ( "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var outputReg = map[string]Factory{} diff --git a/libbeat/outputs/outputs.go b/libbeat/outputs/outputs.go index 2dab0adf06ea..c6808321ce76 100644 --- a/libbeat/outputs/outputs.go +++ b/libbeat/outputs/outputs.go @@ -21,7 +21,7 @@ package outputs import ( - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) // Client provides the minimal interface an output must implement to be usable diff --git a/libbeat/outputs/plugin.go b/libbeat/outputs/plugin.go index 254f93832ce9..b76afedd45a4 100644 --- a/libbeat/outputs/plugin.go +++ b/libbeat/outputs/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/libbeat/plugin" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type outputPlugin struct { diff --git a/libbeat/outputs/redis/backoff.go b/libbeat/outputs/redis/backoff.go index 3084522f6af7..30107df90fa5 100644 --- a/libbeat/outputs/redis/backoff.go +++ b/libbeat/outputs/redis/backoff.go @@ -22,8 +22,8 @@ import ( "github.com/garyburd/redigo/redis" - b "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/publisher" + b "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/publisher" ) type backoffClient struct { diff --git a/libbeat/outputs/redis/client.go b/libbeat/outputs/redis/client.go index 1764d9e60f99..df1c3b91a59c 100644 --- a/libbeat/outputs/redis/client.go +++ b/libbeat/outputs/redis/client.go @@ -26,14 +26,14 @@ import ( "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" ) var ( diff --git a/libbeat/outputs/redis/config.go b/libbeat/outputs/redis/config.go index bcad44af0969..b92c290c2c90 100644 --- a/libbeat/outputs/redis/config.go +++ b/libbeat/outputs/redis/config.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type redisConfig struct { diff --git a/libbeat/outputs/redis/redis.go b/libbeat/outputs/redis/redis.go index fe090dd150cc..7c29568123eb 100644 --- a/libbeat/outputs/redis/redis.go +++ b/libbeat/outputs/redis/redis.go @@ -24,15 +24,15 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type redisOut struct { diff --git a/libbeat/outputs/redis/redis_integration_test.go b/libbeat/outputs/redis/redis_integration_test.go index ef691f25d442..66c3375246a1 100644 --- a/libbeat/outputs/redis/redis_integration_test.go +++ b/libbeat/outputs/redis/redis_integration_test.go @@ -30,12 +30,12 @@ import ( "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/outputs/outest" ) const ( diff --git a/libbeat/outputs/redis/redis_test.go b/libbeat/outputs/redis/redis_test.go index 387c6b363c4d..5ca91d3fef01 100644 --- a/libbeat/outputs/redis/redis_test.go +++ b/libbeat/outputs/redis/redis_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" ) type checker func(*testing.T, outputs.Group) diff --git a/libbeat/outputs/tls.go b/libbeat/outputs/tls.go index 468a8f648547..907af8a79fa0 100644 --- a/libbeat/outputs/tls.go +++ b/libbeat/outputs/tls.go @@ -18,7 +18,7 @@ package outputs import ( - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Managing TLS option with the outputs package is deprecated move your code to use the tlscommon diff --git a/libbeat/outputs/transport/client.go b/libbeat/outputs/transport/client.go index 7855dfc106ef..338801b444d8 100644 --- a/libbeat/outputs/transport/client.go +++ b/libbeat/outputs/transport/client.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/testing" ) type Client struct { diff --git a/libbeat/outputs/transport/proxy.go b/libbeat/outputs/transport/proxy.go index 95bc7f4d00a8..a755a914a671 100644 --- a/libbeat/outputs/transport/proxy.go +++ b/libbeat/outputs/transport/proxy.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/proxy" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // ProxyConfig holds the configuration information required to proxy diff --git a/libbeat/outputs/transport/tcp.go b/libbeat/outputs/transport/tcp.go index b1e6024f8f17..8ffc70debe14 100644 --- a/libbeat/outputs/transport/tcp.go +++ b/libbeat/outputs/transport/tcp.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/testing" ) func NetDialer(timeout time.Duration) Dialer { diff --git a/libbeat/outputs/transport/tls.go b/libbeat/outputs/transport/tls.go index 9bc90b629cef..1ef879e0c89e 100644 --- a/libbeat/outputs/transport/tls.go +++ b/libbeat/outputs/transport/tls.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/testing" ) // TLSConfig is the interface used to configure a tcp client or server from a `Config` diff --git a/libbeat/outputs/transport/transport.go b/libbeat/outputs/transport/transport.go index 28367129d1cf..7ff01c2fa30e 100644 --- a/libbeat/outputs/transport/transport.go +++ b/libbeat/outputs/transport/transport.go @@ -21,7 +21,7 @@ import ( "errors" "net" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type Dialer interface { diff --git a/libbeat/outputs/transport/transptest/testing.go b/libbeat/outputs/transport/transptest/testing.go index 08bcf64cc236..2d91c0711d44 100644 --- a/libbeat/outputs/transport/transptest/testing.go +++ b/libbeat/outputs/transport/transptest/testing.go @@ -31,8 +31,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type MockServer struct { diff --git a/libbeat/outputs/transport/transptest/testing_test.go b/libbeat/outputs/transport/transptest/testing_test.go index 9db2d36fbc03..73b04e157b59 100644 --- a/libbeat/outputs/transport/transptest/testing_test.go +++ b/libbeat/outputs/transport/transptest/testing_test.go @@ -29,7 +29,7 @@ import ( socks5 "github.com/armon/go-socks5" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // netSOCKS5Proxy starts a new SOCKS5 proxy server that listens on localhost. diff --git a/libbeat/plugin/cli.go b/libbeat/plugin/cli.go index 425b2b429343..3111d149ea3f 100644 --- a/libbeat/plugin/cli.go +++ b/libbeat/plugin/cli.go @@ -24,8 +24,8 @@ import ( "flag" "strings" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) type pluginList struct { diff --git a/libbeat/processors/actions/add_fields.go b/libbeat/processors/actions/add_fields.go index f370b4c5c439..3d39c1afb4db 100644 --- a/libbeat/processors/actions/add_fields.go +++ b/libbeat/processors/actions/add_fields.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type addFields struct { diff --git a/libbeat/processors/actions/add_fields_test.go b/libbeat/processors/actions/add_fields_test.go index daaa71482179..a0b7b1d37dc8 100644 --- a/libbeat/processors/actions/add_fields_test.go +++ b/libbeat/processors/actions/add_fields_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddFields(t *testing.T) { diff --git a/libbeat/processors/actions/add_labels.go b/libbeat/processors/actions/add_labels.go index 8d7ddc45d7a7..766966592652 100644 --- a/libbeat/processors/actions/add_labels.go +++ b/libbeat/processors/actions/add_labels.go @@ -20,9 +20,9 @@ package actions import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) // LabelsKey is the default target key for the add_labels processor. diff --git a/libbeat/processors/actions/add_labels_test.go b/libbeat/processors/actions/add_labels_test.go index 50dbbd6ee54c..24ddcbab58f2 100644 --- a/libbeat/processors/actions/add_labels_test.go +++ b/libbeat/processors/actions/add_labels_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddLabels(t *testing.T) { diff --git a/libbeat/processors/actions/add_tags.go b/libbeat/processors/actions/add_tags.go index d8e6cd9811ca..15161ca8114c 100644 --- a/libbeat/processors/actions/add_tags.go +++ b/libbeat/processors/actions/add_tags.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type addTags struct { diff --git a/libbeat/processors/actions/add_tags_test.go b/libbeat/processors/actions/add_tags_test.go index 678d883e5ba2..9ec78b927b11 100644 --- a/libbeat/processors/actions/add_tags_test.go +++ b/libbeat/processors/actions/add_tags_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddTags(t *testing.T) { diff --git a/libbeat/processors/actions/common_test.go b/libbeat/processors/actions/common_test.go index 70071f508526..4c4a294970b9 100644 --- a/libbeat/processors/actions/common_test.go +++ b/libbeat/processors/actions/common_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type testCase struct { diff --git a/libbeat/processors/actions/copy_fields.go b/libbeat/processors/actions/copy_fields.go index c67dd996385f..a709a5ecb421 100644 --- a/libbeat/processors/actions/copy_fields.go +++ b/libbeat/processors/actions/copy_fields.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type copyFields struct { diff --git a/libbeat/processors/actions/copy_fields_test.go b/libbeat/processors/actions/copy_fields_test.go index a3de4ae19470..2c7da0cb02e9 100644 --- a/libbeat/processors/actions/copy_fields_test.go +++ b/libbeat/processors/actions/copy_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestCopyFields(t *testing.T) { diff --git a/libbeat/processors/actions/decode_base64_field.go b/libbeat/processors/actions/decode_base64_field.go index bf2c92dc6e46..4f6b0ff34ab8 100644 --- a/libbeat/processors/actions/decode_base64_field.go +++ b/libbeat/processors/actions/decode_base64_field.go @@ -23,12 +23,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/actions/decode_base64_field_test.go b/libbeat/processors/actions/decode_base64_field_test.go index de4f6a42ed34..3941198a565a 100644 --- a/libbeat/processors/actions/decode_base64_field_test.go +++ b/libbeat/processors/actions/decode_base64_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestDecodeBase64Run(t *testing.T) { diff --git a/libbeat/processors/actions/decode_json_fields.go b/libbeat/processors/actions/decode_json_fields.go index 078ec38f1ccc..90356ff29789 100644 --- a/libbeat/processors/actions/decode_json_fields.go +++ b/libbeat/processors/actions/decode_json_fields.go @@ -25,13 +25,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/jsontransform" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type decodeJSONFields struct { diff --git a/libbeat/processors/actions/decode_json_fields_test.go b/libbeat/processors/actions/decode_json_fields_test.go index 3e801d69e5e4..48c868eec53e 100644 --- a/libbeat/processors/actions/decode_json_fields_test.go +++ b/libbeat/processors/actions/decode_json_fields_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var fields = [1]string{"msg"} diff --git a/libbeat/processors/actions/decompress_gzip_field.go b/libbeat/processors/actions/decompress_gzip_field.go index efa3e04ef829..21c5b7f88b53 100644 --- a/libbeat/processors/actions/decompress_gzip_field.go +++ b/libbeat/processors/actions/decompress_gzip_field.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type decompressGzipField struct { diff --git a/libbeat/processors/actions/decompress_gzip_field_test.go b/libbeat/processors/actions/decompress_gzip_field_test.go index c7b8097997af..0792d60e64d0 100644 --- a/libbeat/processors/actions/decompress_gzip_field_test.go +++ b/libbeat/processors/actions/decompress_gzip_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestDecompressGzip(t *testing.T) { diff --git a/libbeat/processors/actions/drop_event.go b/libbeat/processors/actions/drop_event.go index a24db8fc3f15..52c502188db6 100644 --- a/libbeat/processors/actions/drop_event.go +++ b/libbeat/processors/actions/drop_event.go @@ -18,10 +18,10 @@ package actions import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type dropEvent struct{} diff --git a/libbeat/processors/actions/drop_fields.go b/libbeat/processors/actions/drop_fields.go index cbdd258c43ac..540880a750a0 100644 --- a/libbeat/processors/actions/drop_fields.go +++ b/libbeat/processors/actions/drop_fields.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type dropFields struct { diff --git a/libbeat/processors/actions/extract_field.go b/libbeat/processors/actions/extract_field.go index 4b03f8f8a5ba..58b64caae27d 100644 --- a/libbeat/processors/actions/extract_field.go +++ b/libbeat/processors/actions/extract_field.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type extract_field struct { diff --git a/libbeat/processors/actions/extract_field_test.go b/libbeat/processors/actions/extract_field_test.go index 4973bbffe068..3cbcf2f714f8 100644 --- a/libbeat/processors/actions/extract_field_test.go +++ b/libbeat/processors/actions/extract_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestCommonPaths(t *testing.T) { diff --git a/libbeat/processors/actions/include_fields.go b/libbeat/processors/actions/include_fields.go index ada8d300bef4..32c404d3a78d 100644 --- a/libbeat/processors/actions/include_fields.go +++ b/libbeat/processors/actions/include_fields.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type includeFields struct { diff --git a/libbeat/processors/actions/include_fields_test.go b/libbeat/processors/actions/include_fields_test.go index d33c934de2e0..1432a2f32f75 100644 --- a/libbeat/processors/actions/include_fields_test.go +++ b/libbeat/processors/actions/include_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestIncludeFields(t *testing.T) { diff --git a/libbeat/processors/actions/rename.go b/libbeat/processors/actions/rename.go index 89e92d2a3e6b..9c8e3d756f19 100644 --- a/libbeat/processors/actions/rename.go +++ b/libbeat/processors/actions/rename.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type renameFields struct { diff --git a/libbeat/processors/actions/rename_test.go b/libbeat/processors/actions/rename_test.go index 125986e8a15e..a44f97a2e548 100644 --- a/libbeat/processors/actions/rename_test.go +++ b/libbeat/processors/actions/rename_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRenameRun(t *testing.T) { diff --git a/libbeat/processors/actions/truncate_fields.go b/libbeat/processors/actions/truncate_fields.go index 1c1256f69bcc..ae168312d823 100644 --- a/libbeat/processors/actions/truncate_fields.go +++ b/libbeat/processors/actions/truncate_fields.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type truncateFieldsConfig struct { diff --git a/libbeat/processors/actions/truncate_fields_test.go b/libbeat/processors/actions/truncate_fields_test.go index 45d8fb642726..ccdc92ae41cc 100644 --- a/libbeat/processors/actions/truncate_fields_test.go +++ b/libbeat/processors/actions/truncate_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestTruncateFields(t *testing.T) { diff --git a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go index d4a8ea22baee..e24d71e92655 100644 --- a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go +++ b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_cloud_metadata/http_fetcher.go b/libbeat/processors/add_cloud_metadata/http_fetcher.go index 30e312443337..e9b184786614 100644 --- a/libbeat/processors/add_cloud_metadata/http_fetcher.go +++ b/libbeat/processors/add_cloud_metadata/http_fetcher.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type httpMetadataFetcher struct { diff --git a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go index afa502990a20..7d9e9ee986f5 100644 --- a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go +++ b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go @@ -17,7 +17,7 @@ package add_cloud_metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Alibaba Cloud Metadata Service // Document https://help.aliyun.com/knowledge_detail/49122.html diff --git a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go index 7a6b7265d693..8d887245d86a 100644 --- a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initECSTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go b/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go index ed28f3b38aa5..b65d914f10c9 100644 --- a/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go +++ b/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) const ec2InstanceIdentityURI = "/2014-02-25/dynamic/instance-identity/document" diff --git a/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go b/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go index 69db09c25996..4a54e549c322 100644 --- a/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func createEC2MockAPI(responseMap map[string]string) *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go index 8ee84f417e3b..077e9b610ddb 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) // Azure VM Metadata Service diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go index 23133a4b3877..57f26c8ecd5b 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const azInstanceIdentityDocument = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go index fe016ffb95e9..cc56ae044bd2 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) // DigitalOcean Metadata Service diff --git a/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go b/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go index 3237b6ec8385..5fb19a98feec 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const digitalOceanMetadataV1 = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce.go b/libbeat/processors/add_cloud_metadata/provider_google_gce.go index 27c574f9f1dc..0fe69e1998d4 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce.go @@ -20,9 +20,9 @@ package add_cloud_metadata import ( "path" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) // Google GCE Metadata Service diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go index 7cac4c4376b0..eccc07d4b30d 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const gceMetadataV1 = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go b/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go index cbb516059b9f..17bc5abf6893 100644 --- a/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go +++ b/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go @@ -18,7 +18,7 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const ( diff --git a/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go b/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go index bb2c0b4b28ad..d5c38a8437b5 100644 --- a/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initOpenstackNovaTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go index d24778c6850c..be5956955353 100644 --- a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go +++ b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go @@ -17,7 +17,7 @@ package add_cloud_metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Tencent Cloud Metadata Service // Document https://www.qcloud.com/document/product/213/4934 diff --git a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go index 72be1934c2d6..1615d37a38cc 100644 --- a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initQCloudTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/providers.go b/libbeat/processors/add_cloud_metadata/providers.go index 301e7d4731f6..0fc4c5c783ab 100644 --- a/libbeat/processors/add_cloud_metadata/providers.go +++ b/libbeat/processors/add_cloud_metadata/providers.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type provider struct { diff --git a/libbeat/processors/add_cloud_metadata/providers_test.go b/libbeat/processors/add_cloud_metadata/providers_test.go index e9c8732c54a2..eed1e752278d 100644 --- a/libbeat/processors/add_cloud_metadata/providers_test.go +++ b/libbeat/processors/add_cloud_metadata/providers_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProvidersFilter(t *testing.T) { diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata.go b/libbeat/processors/add_docker_metadata/add_docker_metadata.go index 8020955dd591..28f8831bc128 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata.go @@ -30,14 +30,14 @@ import ( "github.com/elastic/gosigar/cgroup" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/actions" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go b/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go index 7ed4f486cb59..2d8a5a9e970b 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/processors/add_docker_metadata/config.go b/libbeat/processors/add_docker_metadata/config.go index 930ca4ecdc6e..89e97fa9af42 100644 --- a/libbeat/processors/add_docker_metadata/config.go +++ b/libbeat/processors/add_docker_metadata/config.go @@ -22,7 +22,7 @@ package add_docker_metadata import ( "time" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Config for docker processor. diff --git a/libbeat/processors/add_formatted_index/add_formatted_index.go b/libbeat/processors/add_formatted_index/add_formatted_index.go index ed947be73491..72be2a89775c 100644 --- a/libbeat/processors/add_formatted_index/add_formatted_index.go +++ b/libbeat/processors/add_formatted_index/add_formatted_index.go @@ -20,9 +20,9 @@ package add_formatted_index import ( "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) // AddFormattedIndex is a Processor to set an event's "raw_index" metadata field diff --git a/libbeat/processors/add_host_metadata/add_host_metadata.go b/libbeat/processors/add_host_metadata/add_host_metadata.go index 6cfc938e5f0c..112f59bb5880 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata.go @@ -24,13 +24,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/host" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/host" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/processors/util" "github.com/elastic/go-sysinfo" ) diff --git a/libbeat/processors/add_host_metadata/add_host_metadata_test.go b/libbeat/processors/add_host_metadata/add_host_metadata_test.go index 1ef8035f6252..500fc4ba9d8c 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata_test.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/processors/add_host_metadata/config.go b/libbeat/processors/add_host_metadata/config.go index 76e3709ff2f1..81c0452f4d93 100644 --- a/libbeat/processors/add_host_metadata/config.go +++ b/libbeat/processors/add_host_metadata/config.go @@ -20,7 +20,7 @@ package add_host_metadata import ( "time" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/processors/util" ) // Config for add_host_metadata processor. diff --git a/libbeat/processors/add_id/add_id.go b/libbeat/processors/add_id/add_id.go index 5df081460c33..44d03f6cd7c5 100644 --- a/libbeat/processors/add_id/add_id.go +++ b/libbeat/processors/add_id/add_id.go @@ -20,12 +20,12 @@ package add_id import ( "fmt" - "github.com/elastic/beats/libbeat/processors/add_id/generator" + "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) func init() { diff --git a/libbeat/processors/add_id/add_id_test.go b/libbeat/processors/add_id/add_id_test.go index 6a3fb5b3a099..54ad579e9fd2 100644 --- a/libbeat/processors/add_id/add_id_test.go +++ b/libbeat/processors/add_id/add_id_test.go @@ -20,9 +20,9 @@ package add_id import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/processors/add_id/config.go b/libbeat/processors/add_id/config.go index ca28d48d68ee..04a1c114219e 100644 --- a/libbeat/processors/add_id/config.go +++ b/libbeat/processors/add_id/config.go @@ -18,7 +18,7 @@ package add_id import ( - "github.com/elastic/beats/libbeat/processors/add_id/generator" + "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" ) // configuration for Add ID processor. diff --git a/libbeat/processors/add_kubernetes_metadata/cache.go b/libbeat/processors/add_kubernetes_metadata/cache.go index f5fb4ba52e65..da7492b43a92 100644 --- a/libbeat/processors/add_kubernetes_metadata/cache.go +++ b/libbeat/processors/add_kubernetes_metadata/cache.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type cache struct { diff --git a/libbeat/processors/add_kubernetes_metadata/config.go b/libbeat/processors/add_kubernetes_metadata/config.go index 84d2c246948d..b5e492d8ccc0 100644 --- a/libbeat/processors/add_kubernetes_metadata/config.go +++ b/libbeat/processors/add_kubernetes_metadata/config.go @@ -20,7 +20,7 @@ package add_kubernetes_metadata import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type kubeAnnotatorConfig struct { diff --git a/libbeat/processors/add_kubernetes_metadata/indexers.go b/libbeat/processors/add_kubernetes_metadata/indexers.go index 3d6dd601fcb9..673337fa7936 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers.go @@ -21,11 +21,11 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/indexers_test.go b/libbeat/processors/add_kubernetes_metadata/indexers_test.go index 278275f10fd1..5eca3050fae8 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil) diff --git a/libbeat/processors/add_kubernetes_metadata/indexing.go b/libbeat/processors/add_kubernetes_metadata/indexing.go index e5485abe47b3..d011d0c7a970 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexing.go +++ b/libbeat/processors/add_kubernetes_metadata/indexing.go @@ -20,7 +20,7 @@ package add_kubernetes_metadata import ( "sync" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Indexing is the singleton Register instance where all Indexers and Matchers diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go index 743c192902f7..a02e213cdc9b 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes.go @@ -27,13 +27,13 @@ import ( k8sclient "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go index 4da15db969b4..7d18d169e401 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Test metadata updates don't replace existing pod metrics diff --git a/libbeat/processors/add_kubernetes_metadata/matchers.go b/libbeat/processors/add_kubernetes_metadata/matchers.go index 61590821771f..ca14746f1304 100644 --- a/libbeat/processors/add_kubernetes_metadata/matchers.go +++ b/libbeat/processors/add_kubernetes_metadata/matchers.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/format" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/codec/format" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/matchers_test.go b/libbeat/processors/add_kubernetes_metadata/matchers_test.go index 0a1c723f6c3e..13e453426e76 100644 --- a/libbeat/processors/add_kubernetes_metadata/matchers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/matchers_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFieldMatcher(t *testing.T) { diff --git a/libbeat/processors/add_kubernetes_metadata/registry.go b/libbeat/processors/add_kubernetes_metadata/registry.go index 7198f485557c..417cb9e55334 100644 --- a/libbeat/processors/add_kubernetes_metadata/registry.go +++ b/libbeat/processors/add_kubernetes_metadata/registry.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/libbeat/plugin" + p "github.com/elastic/beats/v7/libbeat/plugin" ) var ( diff --git a/libbeat/processors/add_locale/add_locale.go b/libbeat/processors/add_locale/add_locale.go index 9d98c045df7e..b45682313a30 100644 --- a/libbeat/processors/add_locale/add_locale.go +++ b/libbeat/processors/add_locale/add_locale.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type addLocale struct { diff --git a/libbeat/processors/add_locale/add_locale_test.go b/libbeat/processors/add_locale/add_locale_test.go index e1b11610984e..66b5cafd4e2a 100644 --- a/libbeat/processors/add_locale/add_locale_test.go +++ b/libbeat/processors/add_locale/add_locale_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestExportTimezone(t *testing.T) { diff --git a/libbeat/processors/add_observer_metadata/add_observer_metadata.go b/libbeat/processors/add_observer_metadata/add_observer_metadata.go index b1740df00670..b61d00536124 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/processors/util" "github.com/elastic/go-sysinfo" ) diff --git a/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go b/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go index c9d55318fdd8..69de476b7fd3 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigDefault(t *testing.T) { diff --git a/libbeat/processors/add_observer_metadata/config.go b/libbeat/processors/add_observer_metadata/config.go index aea1fff2c1d2..91acdc9e6d28 100644 --- a/libbeat/processors/add_observer_metadata/config.go +++ b/libbeat/processors/add_observer_metadata/config.go @@ -20,7 +20,7 @@ package add_observer_metadata import ( "time" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/processors/util" ) // Config for add_host_metadata processor. diff --git a/libbeat/processors/add_process_metadata/add_process_metadata.go b/libbeat/processors/add_process_metadata/add_process_metadata.go index 2b78fcb817e4..4b6270c9f6e0 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_process_metadata/add_process_metadata_test.go b/libbeat/processors/add_process_metadata/add_process_metadata_test.go index 8f76c5ec685f..16d3f38fa714 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata_test.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata_test.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestAddProcessMetadata(t *testing.T) { diff --git a/libbeat/processors/add_process_metadata/config.go b/libbeat/processors/add_process_metadata/config.go index fb42a3e716a3..87d375b0a09a 100644 --- a/libbeat/processors/add_process_metadata/config.go +++ b/libbeat/processors/add_process_metadata/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type config struct { diff --git a/libbeat/processors/checks/checks.go b/libbeat/processors/checks/checks.go index d275278544b8..6291ba57b2be 100644 --- a/libbeat/processors/checks/checks.go +++ b/libbeat/processors/checks/checks.go @@ -20,8 +20,8 @@ package checks import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // ConfigChecked returns a wrapper that will validate the configuration using diff --git a/libbeat/processors/checks/checks_test.go b/libbeat/processors/checks/checks_test.go index 656f922fccc5..c84965bbb132 100644 --- a/libbeat/processors/checks/checks_test.go +++ b/libbeat/processors/checks/checks_test.go @@ -20,9 +20,9 @@ package checks import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type mockProcessor struct{} diff --git a/libbeat/processors/communityid/communityid.go b/libbeat/processors/communityid/communityid.go index f5c2812f6b18..db24fe34eaf3 100644 --- a/libbeat/processors/communityid/communityid.go +++ b/libbeat/processors/communityid/communityid.go @@ -26,12 +26,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/flowhash" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.community_id" diff --git a/libbeat/processors/communityid/communityid_test.go b/libbeat/processors/communityid/communityid_test.go index 1820c78ba409..97a7644bbe91 100644 --- a/libbeat/processors/communityid/communityid_test.go +++ b/libbeat/processors/communityid/communityid_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNewDefaults(t *testing.T) { diff --git a/libbeat/processors/conditionals.go b/libbeat/processors/conditionals.go index ca563702f869..70f0c7ef48c7 100644 --- a/libbeat/processors/conditionals.go +++ b/libbeat/processors/conditionals.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/conditions" ) // NewConditional returns a constructor suitable for registering when conditionals as a plugin. diff --git a/libbeat/processors/conditionals_test.go b/libbeat/processors/conditionals_test.go index baf097b2385b..7521d3a72c1a 100644 --- a/libbeat/processors/conditionals_test.go +++ b/libbeat/processors/conditionals_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type countFilter struct { diff --git a/libbeat/processors/config.go b/libbeat/processors/config.go index 46be05753f41..5477626a5987 100644 --- a/libbeat/processors/config.go +++ b/libbeat/processors/config.go @@ -18,7 +18,7 @@ package processors import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PluginConfig represents the list of processors. diff --git a/libbeat/processors/convert/convert.go b/libbeat/processors/convert/convert.go index 887fbdd02a9f..c6f3e5aea285 100644 --- a/libbeat/processors/convert/convert.go +++ b/libbeat/processors/convert/convert.go @@ -26,11 +26,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.convert" diff --git a/libbeat/processors/convert/convert_test.go b/libbeat/processors/convert/convert_test.go index 141fafc0f8fe..1eba3ff550fe 100644 --- a/libbeat/processors/convert/convert_test.go +++ b/libbeat/processors/convert/convert_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConvert(t *testing.T) { diff --git a/libbeat/processors/decode_csv_fields/decode_csv_fields.go b/libbeat/processors/decode_csv_fields/decode_csv_fields.go index e65fe2231ac8..ff2cdf0938c8 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type decodeCSVFields struct { diff --git a/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go b/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go index 68a35b6300aa..8a406ca06e6a 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDecodeCSVField(t *testing.T) { diff --git a/libbeat/processors/dissect/config_test.go b/libbeat/processors/dissect/config_test.go index dfe93274a881..09d4da5a1805 100644 --- a/libbeat/processors/dissect/config_test.go +++ b/libbeat/processors/dissect/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfig(t *testing.T) { diff --git a/libbeat/processors/dissect/processor.go b/libbeat/processors/dissect/processor.go index ab5c18903092..ac812e9ffaeb 100644 --- a/libbeat/processors/dissect/processor.go +++ b/libbeat/processors/dissect/processor.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const flagParsingError = "dissect_parsing_error" diff --git a/libbeat/processors/dissect/processor_test.go b/libbeat/processors/dissect/processor_test.go index f822db1d6e37..26a579ae6999 100644 --- a/libbeat/processors/dissect/processor_test.go +++ b/libbeat/processors/dissect/processor_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProcessor(t *testing.T) { diff --git a/libbeat/processors/dns/cache.go b/libbeat/processors/dns/cache.go index 57fa99a17b69..6bd6b373db90 100644 --- a/libbeat/processors/dns/cache.go +++ b/libbeat/processors/dns/cache.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type ptrRecord struct { diff --git a/libbeat/processors/dns/cache_test.go b/libbeat/processors/dns/cache_test.go index b2ad5af75a54..d64dbd460b46 100644 --- a/libbeat/processors/dns/cache_test.go +++ b/libbeat/processors/dns/cache_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type stubResolver struct{} diff --git a/libbeat/processors/dns/config.go b/libbeat/processors/dns/config.go index 4345d73db0a5..ae447a20c721 100644 --- a/libbeat/processors/dns/config.go +++ b/libbeat/processors/dns/config.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Config defines the configuration options for the DNS processor. diff --git a/libbeat/processors/dns/dns.go b/libbeat/processors/dns/dns.go index 7dc447d44c6e..49b4946733ed 100644 --- a/libbeat/processors/dns/dns.go +++ b/libbeat/processors/dns/dns.go @@ -25,13 +25,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.dns" diff --git a/libbeat/processors/dns/dns_test.go b/libbeat/processors/dns/dns_test.go index d4fe14e28dfa..bdd92e1f088f 100644 --- a/libbeat/processors/dns/dns_test.go +++ b/libbeat/processors/dns/dns_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func TestDNSProcessorRun(t *testing.T) { diff --git a/libbeat/processors/dns/resolver.go b/libbeat/processors/dns/resolver.go index c4f54c73c87d..701ee8e49ace 100644 --- a/libbeat/processors/dns/resolver.go +++ b/libbeat/processors/dns/resolver.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" ) const etcResolvConf = "/etc/resolv.conf" diff --git a/libbeat/processors/dns/resolver_test.go b/libbeat/processors/dns/resolver_test.go index a8e6e9ad13da..0340da316d7e 100644 --- a/libbeat/processors/dns/resolver_test.go +++ b/libbeat/processors/dns/resolver_test.go @@ -25,7 +25,7 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var _ PTRResolver = (*MiekgResolver)(nil) diff --git a/libbeat/processors/extract_array/extract_array.go b/libbeat/processors/extract_array/extract_array.go index ce76b0962aea..1c9fc05da93e 100644 --- a/libbeat/processors/extract_array/extract_array.go +++ b/libbeat/processors/extract_array/extract_array.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) type config struct { diff --git a/libbeat/processors/extract_array/extract_array_test.go b/libbeat/processors/extract_array/extract_array_test.go index 8dbde97a50a8..1707e317530f 100644 --- a/libbeat/processors/extract_array/extract_array_test.go +++ b/libbeat/processors/extract_array/extract_array_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestExtractArrayProcessor_String(t *testing.T) { diff --git a/libbeat/processors/fingerprint/fingerprint.go b/libbeat/processors/fingerprint/fingerprint.go index b0f877dfeb32..90d051cec77a 100644 --- a/libbeat/processors/fingerprint/fingerprint.go +++ b/libbeat/processors/fingerprint/fingerprint.go @@ -23,10 +23,10 @@ import ( "io" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) func init() { diff --git a/libbeat/processors/fingerprint/fingerprint_test.go b/libbeat/processors/fingerprint/fingerprint_test.go index e0cb0475f546..6274af7c0b29 100644 --- a/libbeat/processors/fingerprint/fingerprint_test.go +++ b/libbeat/processors/fingerprint/fingerprint_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestHashMethods(t *testing.T) { diff --git a/libbeat/processors/fingerprint/hash.go b/libbeat/processors/fingerprint/hash.go index cc957d03258d..1c4af0d0161a 100644 --- a/libbeat/processors/fingerprint/hash.go +++ b/libbeat/processors/fingerprint/hash.go @@ -25,7 +25,7 @@ import ( "hash" "strings" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) type hashMethod func() hash.Hash diff --git a/libbeat/processors/namespace.go b/libbeat/processors/namespace.go index 1dd10f4b5172..5bd8a0635ce1 100644 --- a/libbeat/processors/namespace.go +++ b/libbeat/processors/namespace.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Namespace struct { diff --git a/libbeat/processors/namespace_test.go b/libbeat/processors/namespace_test.go index 73b71ad36ad2..43698ebdf4a9 100644 --- a/libbeat/processors/namespace_test.go +++ b/libbeat/processors/namespace_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type testFilterRule struct { diff --git a/libbeat/processors/processor.go b/libbeat/processors/processor.go index 5eaa6dd2fb4c..c5002b7cebd5 100644 --- a/libbeat/processors/processor.go +++ b/libbeat/processors/processor.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const logName = "processors" diff --git a/libbeat/processors/processor_test.go b/libbeat/processors/processor_test.go index b6168aa41181..e4fe0d58481d 100644 --- a/libbeat/processors/processor_test.go +++ b/libbeat/processors/processor_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - _ "github.com/elastic/beats/libbeat/processors/actions" - _ "github.com/elastic/beats/libbeat/processors/add_cloud_metadata" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + _ "github.com/elastic/beats/v7/libbeat/processors/actions" + _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" ) func GetProcessors(t testing.TB, yml []map[string]interface{}) *processors.Processors { diff --git a/libbeat/processors/registered_domain/registered_domain.go b/libbeat/processors/registered_domain/registered_domain.go index b378da752339..047ef4472347 100644 --- a/libbeat/processors/registered_domain/registered_domain.go +++ b/libbeat/processors/registered_domain/registered_domain.go @@ -23,12 +23,12 @@ import ( "github.com/pkg/errors" "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/registered_domain/registered_domain_test.go b/libbeat/processors/registered_domain/registered_domain_test.go index 8434242d7b09..53d1184d7476 100644 --- a/libbeat/processors/registered_domain/registered_domain_test.go +++ b/libbeat/processors/registered_domain/registered_domain_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProcessorRun(t *testing.T) { diff --git a/libbeat/processors/registry.go b/libbeat/processors/registry.go index f8e32c5c78ff..2e771bc331d0 100644 --- a/libbeat/processors/registry.go +++ b/libbeat/processors/registry.go @@ -20,9 +20,9 @@ package processors import ( "errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type processorPlugin struct { diff --git a/libbeat/processors/script/javascript/beatevent_v0.go b/libbeat/processors/script/javascript/beatevent_v0.go index fa9420793364..a24135f30dac 100644 --- a/libbeat/processors/script/javascript/beatevent_v0.go +++ b/libbeat/processors/script/javascript/beatevent_v0.go @@ -21,8 +21,8 @@ import ( "github.com/dop251/goja" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // IMPORTANT: diff --git a/libbeat/processors/script/javascript/beatevent_v0_test.go b/libbeat/processors/script/javascript/beatevent_v0_test.go index dc1f66bb71d0..030a260d4240 100644 --- a/libbeat/processors/script/javascript/beatevent_v0_test.go +++ b/libbeat/processors/script/javascript/beatevent_v0_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) const ( diff --git a/libbeat/processors/script/javascript/javascript.go b/libbeat/processors/script/javascript/javascript.go index 4f222fe3e346..e23ee3b83b40 100644 --- a/libbeat/processors/script/javascript/javascript.go +++ b/libbeat/processors/script/javascript/javascript.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/processors" ) type jsProcessor struct { diff --git a/libbeat/processors/script/javascript/module/console/console.go b/libbeat/processors/script/javascript/module/console/console.go index 92188f230c43..281ba3d12409 100644 --- a/libbeat/processors/script/javascript/module/console/console.go +++ b/libbeat/processors/script/javascript/module/console/console.go @@ -22,7 +22,7 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" // Require the util module for handling the log format arguments. _ "github.com/dop251/goja_nodejs/util" diff --git a/libbeat/processors/script/javascript/module/console/console_test.go b/libbeat/processors/script/javascript/module/console/console_test.go index 48fe4165c076..aa4c00ce6c1f 100644 --- a/libbeat/processors/script/javascript/module/console/console_test.go +++ b/libbeat/processors/script/javascript/module/console/console_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" // Register require module. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) func TestConsole(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/include.go b/libbeat/processors/script/javascript/module/include.go index 6b4608a51eae..f30e423e7a23 100644 --- a/libbeat/processors/script/javascript/module/include.go +++ b/libbeat/processors/script/javascript/module/include.go @@ -19,9 +19,9 @@ package module import ( // Register javascript modules. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/console" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/console" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/net" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/path" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) diff --git a/libbeat/processors/script/javascript/module/net/net_test.go b/libbeat/processors/script/javascript/module/net/net_test.go index f54014036439..559fff00d503 100644 --- a/libbeat/processors/script/javascript/module/net/net_test.go +++ b/libbeat/processors/script/javascript/module/net/net_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/net" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) func TestNetIsIP(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/path/path_test.go b/libbeat/processors/script/javascript/module/path/path_test.go index f1288d92aa3c..4ad47de13a53 100644 --- a/libbeat/processors/script/javascript/module/path/path_test.go +++ b/libbeat/processors/script/javascript/module/path/path_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/path" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) func TestWin32(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/processor/chain.go b/libbeat/processors/script/javascript/module/processor/chain.go index 947903c57ef5..e58aac293720 100644 --- a/libbeat/processors/script/javascript/module/processor/chain.go +++ b/libbeat/processors/script/javascript/module/processor/chain.go @@ -21,9 +21,9 @@ import ( "github.com/dop251/goja" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) // chainBuilder builds a new processor chain. diff --git a/libbeat/processors/script/javascript/module/processor/processor.go b/libbeat/processors/script/javascript/module/processor/processor.go index da5a914cd924..31fecc0cdd67 100644 --- a/libbeat/processors/script/javascript/module/processor/processor.go +++ b/libbeat/processors/script/javascript/module/processor/processor.go @@ -22,9 +22,9 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) // Create constructors for most of the Beat processors. diff --git a/libbeat/processors/script/javascript/module/processor/processor_test.go b/libbeat/processors/script/javascript/module/processor/processor_test.go index 7faddd241c51..6ea66f409ffe 100644 --- a/libbeat/processors/script/javascript/module/processor/processor_test.go +++ b/libbeat/processors/script/javascript/module/processor/processor_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) func init() { diff --git a/libbeat/processors/script/javascript/module/require/require.go b/libbeat/processors/script/javascript/module/require/require.go index e9da5e9076e6..db0dcaaa4efc 100644 --- a/libbeat/processors/script/javascript/module/require/require.go +++ b/libbeat/processors/script/javascript/module/require/require.go @@ -21,7 +21,7 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) func init() { diff --git a/libbeat/processors/script/javascript/session.go b/libbeat/processors/script/javascript/session.go index ca892fc5537e..1bade0cc2ba3 100644 --- a/libbeat/processors/script/javascript/session.go +++ b/libbeat/processors/script/javascript/session.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/processors/script/javascript/session_test.go b/libbeat/processors/script/javascript/session_test.go index 7f7443394aaa..043253c93d66 100644 --- a/libbeat/processors/script/javascript/session_test.go +++ b/libbeat/processors/script/javascript/session_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/processors/script/processor.go b/libbeat/processors/script/processor.go index 640659ecbfb2..7f61c7cfae5a 100644 --- a/libbeat/processors/script/processor.go +++ b/libbeat/processors/script/processor.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" // Register javascript modules with the processor. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" ) func init() { diff --git a/libbeat/processors/timeseries/timeseries.go b/libbeat/processors/timeseries/timeseries.go index 79e68edb5336..45b71ce79bfe 100644 --- a/libbeat/processors/timeseries/timeseries.go +++ b/libbeat/processors/timeseries/timeseries.go @@ -20,11 +20,11 @@ package timeseries import ( "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/processors" "github.com/mitchellh/hashstructure" ) diff --git a/libbeat/processors/timeseries/timeseries_test.go b/libbeat/processors/timeseries/timeseries_test.go index f25c56030b59..18dedb5b88a6 100644 --- a/libbeat/processors/timeseries/timeseries_test.go +++ b/libbeat/processors/timeseries/timeseries_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/processors/timestamp/timestamp.go b/libbeat/processors/timestamp/timestamp.go index 4971c24cc441..20da35fdb7a2 100644 --- a/libbeat/processors/timestamp/timestamp.go +++ b/libbeat/processors/timestamp/timestamp.go @@ -24,11 +24,11 @@ import ( "4d63.com/tz" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.timestamp" diff --git a/libbeat/processors/timestamp/timestamp_test.go b/libbeat/processors/timestamp/timestamp_test.go index 814f91637129..4b7e8dd09939 100644 --- a/libbeat/processors/timestamp/timestamp_test.go +++ b/libbeat/processors/timestamp/timestamp_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var expected = time.Date(2015, 3, 7, 11, 6, 39, 0, time.UTC) diff --git a/libbeat/processors/util/geo.go b/libbeat/processors/util/geo.go index d8decf0de9c1..48d39780d22a 100644 --- a/libbeat/processors/util/geo.go +++ b/libbeat/processors/util/geo.go @@ -21,7 +21,7 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // GeoConfig contains geo configuration data. diff --git a/libbeat/processors/util/geo_test.go b/libbeat/processors/util/geo_test.go index cd7334c766cc..aa8754c2c329 100644 --- a/libbeat/processors/util/geo_test.go +++ b/libbeat/processors/util/geo_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // parseGeoConfig converts the map into a GeoConfig. diff --git a/libbeat/publisher/event.go b/libbeat/publisher/event.go index 8edc2e9db7f3..29625319e7c1 100644 --- a/libbeat/publisher/event.go +++ b/libbeat/publisher/event.go @@ -18,8 +18,8 @@ package publisher import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Batch is used to pass a batch of events to the outputs and asynchronously listening diff --git a/libbeat/publisher/includes/includes.go b/libbeat/publisher/includes/includes.go index be42bdbabcac..e6f3ded0beea 100644 --- a/libbeat/publisher/includes/includes.go +++ b/libbeat/publisher/includes/includes.go @@ -19,14 +19,14 @@ package includes import ( // import queue types - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - _ "github.com/elastic/beats/libbeat/outputs/console" - _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/libbeat/outputs/fileout" - _ "github.com/elastic/beats/libbeat/outputs/kafka" - _ "github.com/elastic/beats/libbeat/outputs/logstash" - _ "github.com/elastic/beats/libbeat/outputs/redis" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + _ "github.com/elastic/beats/v7/libbeat/outputs/console" + _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + _ "github.com/elastic/beats/v7/libbeat/outputs/fileout" + _ "github.com/elastic/beats/v7/libbeat/outputs/kafka" + _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" + _ "github.com/elastic/beats/v7/libbeat/outputs/redis" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/spool" ) diff --git a/libbeat/publisher/pipeline/acker.go b/libbeat/publisher/pipeline/acker.go index 3436f7a25289..ad0b0366416d 100644 --- a/libbeat/publisher/pipeline/acker.go +++ b/libbeat/publisher/pipeline/acker.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) // acker is used to account for published and non-published events to be ACKed diff --git a/libbeat/publisher/pipeline/batch.go b/libbeat/publisher/pipeline/batch.go index 7ce87bd77a58..5a8903c58140 100644 --- a/libbeat/publisher/pipeline/batch.go +++ b/libbeat/publisher/pipeline/batch.go @@ -20,8 +20,8 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type Batch struct { diff --git a/libbeat/publisher/pipeline/client.go b/libbeat/publisher/pipeline/client.go index c508c66db62c..d8413d97b30b 100644 --- a/libbeat/publisher/pipeline/client.go +++ b/libbeat/publisher/pipeline/client.go @@ -20,11 +20,11 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // client connects a beat with the processors and pipeline queue. diff --git a/libbeat/publisher/pipeline/client_ack.go b/libbeat/publisher/pipeline/client_ack.go index 5ace3de7fcef..cbd8fc9bb2da 100644 --- a/libbeat/publisher/pipeline/client_ack.go +++ b/libbeat/publisher/pipeline/client_ack.go @@ -20,8 +20,8 @@ package pipeline import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) type clientACKer struct { diff --git a/libbeat/publisher/pipeline/client_test.go b/libbeat/publisher/pipeline/client_test.go index c7b83835c9cb..90b29c7c848e 100644 --- a/libbeat/publisher/pipeline/client_test.go +++ b/libbeat/publisher/pipeline/client_test.go @@ -22,11 +22,11 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) func TestClient(t *testing.T) { diff --git a/libbeat/publisher/pipeline/config.go b/libbeat/publisher/pipeline/config.go index 70006d417c6d..775e75d95e22 100644 --- a/libbeat/publisher/pipeline/config.go +++ b/libbeat/publisher/pipeline/config.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // Config object for loading a pipeline instance via Load. diff --git a/libbeat/publisher/pipeline/consumer.go b/libbeat/publisher/pipeline/consumer.go index cba643c94ee7..4dd211052c25 100644 --- a/libbeat/publisher/pipeline/consumer.go +++ b/libbeat/publisher/pipeline/consumer.go @@ -18,9 +18,9 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // eventConsumer collects and forwards events from the queue to the outputs work queue. diff --git a/libbeat/publisher/pipeline/controller.go b/libbeat/publisher/pipeline/controller.go index 885d0cd02941..05bd65338a98 100644 --- a/libbeat/publisher/pipeline/controller.go +++ b/libbeat/publisher/pipeline/controller.go @@ -18,11 +18,11 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // outputController manages the pipelines output capabilities, like: diff --git a/libbeat/publisher/pipeline/module.go b/libbeat/publisher/pipeline/module.go index bbd5bb56cbf0..8a7c419762bc 100644 --- a/libbeat/publisher/pipeline/module.go +++ b/libbeat/publisher/pipeline/module.go @@ -21,13 +21,13 @@ import ( "flag" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // Global pipeline module for loading the main pipeline from a configuration object diff --git a/libbeat/publisher/pipeline/monitoring.go b/libbeat/publisher/pipeline/monitoring.go index 4fbf3ff8da02..b41baed1785d 100644 --- a/libbeat/publisher/pipeline/monitoring.go +++ b/libbeat/publisher/pipeline/monitoring.go @@ -17,7 +17,7 @@ package pipeline -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" type observer interface { pipelineObserver diff --git a/libbeat/publisher/pipeline/output.go b/libbeat/publisher/pipeline/output.go index 60ed3519ae0c..21ac004acb74 100644 --- a/libbeat/publisher/pipeline/output.go +++ b/libbeat/publisher/pipeline/output.go @@ -18,9 +18,9 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" ) // clientWorker manages output client of type outputs.Client, not supporting reconnect. diff --git a/libbeat/publisher/pipeline/pipeline.go b/libbeat/publisher/pipeline/pipeline.go index 688b7315c748..857e80f9bd8d 100644 --- a/libbeat/publisher/pipeline/pipeline.go +++ b/libbeat/publisher/pipeline/pipeline.go @@ -26,15 +26,15 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // Pipeline implementation providint all beats publisher functionality. diff --git a/libbeat/publisher/pipeline/pipeline_ack.go b/libbeat/publisher/pipeline/pipeline_ack.go index b9be8c42e495..e9efb390f4f6 100644 --- a/libbeat/publisher/pipeline/pipeline_ack.go +++ b/libbeat/publisher/pipeline/pipeline_ack.go @@ -20,7 +20,7 @@ package pipeline import ( "errors" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type ackBuilder interface { diff --git a/libbeat/publisher/pipeline/pipeline_test.go b/libbeat/publisher/pipeline/pipeline_test.go index c5ff791bf681..88a0c21f6315 100644 --- a/libbeat/publisher/pipeline/pipeline_test.go +++ b/libbeat/publisher/pipeline/pipeline_test.go @@ -20,9 +20,9 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type testQueue struct { diff --git a/libbeat/publisher/pipeline/retry.go b/libbeat/publisher/pipeline/retry.go index 9dd3385c40ee..a65a7d227c8c 100644 --- a/libbeat/publisher/pipeline/retry.go +++ b/libbeat/publisher/pipeline/retry.go @@ -20,7 +20,7 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // retryer is responsible for accepting and managing failed send attempts. It diff --git a/libbeat/publisher/pipeline/stress/gen.go b/libbeat/publisher/pipeline/stress/gen.go index d33049bc3903..e5a18ceaef62 100644 --- a/libbeat/publisher/pipeline/stress/gen.go +++ b/libbeat/publisher/pipeline/stress/gen.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" ) type generateConfig struct { diff --git a/libbeat/publisher/pipeline/stress/out.go b/libbeat/publisher/pipeline/stress/out.go index 211e056ce602..692d62f98ab3 100644 --- a/libbeat/publisher/pipeline/stress/out.go +++ b/libbeat/publisher/pipeline/stress/out.go @@ -21,10 +21,10 @@ import ( "math/rand" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher" ) type testOutput struct { diff --git a/libbeat/publisher/pipeline/stress/run.go b/libbeat/publisher/pipeline/stress/run.go index 902d303e94f4..8a46489ae6cf 100644 --- a/libbeat/publisher/pipeline/stress/run.go +++ b/libbeat/publisher/pipeline/stress/run.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/publisher/processing" ) type config struct { diff --git a/libbeat/publisher/pipeline/stress/sig.go b/libbeat/publisher/pipeline/stress/sig.go index 913e4b7aa014..537fc9c633bb 100644 --- a/libbeat/publisher/pipeline/stress/sig.go +++ b/libbeat/publisher/pipeline/stress/sig.go @@ -17,7 +17,7 @@ package stress -import "github.com/elastic/beats/libbeat/common/atomic" +import "github.com/elastic/beats/v7/libbeat/common/atomic" type closeSignaler struct { active atomic.Bool diff --git a/libbeat/publisher/pipeline/stress/stress_test.go b/libbeat/publisher/pipeline/stress/stress_test.go index 2f0899d8a18b..04f39e49afda 100644 --- a/libbeat/publisher/pipeline/stress/stress_test.go +++ b/libbeat/publisher/pipeline/stress/stress_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline/stress" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/spool" ) // additional flags diff --git a/libbeat/publisher/processing/default.go b/libbeat/publisher/processing/default.go index cd15a0750fd8..dea3fe88fd8b 100644 --- a/libbeat/publisher/processing/default.go +++ b/libbeat/publisher/processing/default.go @@ -22,14 +22,14 @@ import ( "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" - "github.com/elastic/beats/libbeat/processors/timeseries" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/processors/timeseries" ) // builder is used to create the event processing pipeline in Beats. The diff --git a/libbeat/publisher/processing/default_test.go b/libbeat/publisher/processing/default_test.go index c21345d27014..ba6a6042993f 100644 --- a/libbeat/publisher/processing/default_test.go +++ b/libbeat/publisher/processing/default_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/actions" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/libbeat/publisher/processing/processing.go b/libbeat/publisher/processing/processing.go index ff1be24fc453..4f615fb1422f 100644 --- a/libbeat/publisher/processing/processing.go +++ b/libbeat/publisher/processing/processing.go @@ -18,9 +18,9 @@ package processing import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // SupportFactory creates a new processing Supporter that can be used with diff --git a/libbeat/publisher/processing/processors.go b/libbeat/publisher/processing/processors.go index bb0b2c7ccf03..0125008c39fc 100644 --- a/libbeat/publisher/processing/processors.go +++ b/libbeat/publisher/processing/processors.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/processors" ) type group struct { diff --git a/libbeat/publisher/queue/memqueue/batchbuf.go b/libbeat/publisher/queue/memqueue/batchbuf.go index d84c8717acfc..30019cadeb63 100644 --- a/libbeat/publisher/queue/memqueue/batchbuf.go +++ b/libbeat/publisher/queue/memqueue/batchbuf.go @@ -17,7 +17,7 @@ package memqueue -import "github.com/elastic/beats/libbeat/publisher" +import "github.com/elastic/beats/v7/libbeat/publisher" type batchBuffer struct { next *batchBuffer diff --git a/libbeat/publisher/queue/memqueue/broker.go b/libbeat/publisher/queue/memqueue/broker.go index 443ff3542f42..e135a6b6d7cb 100644 --- a/libbeat/publisher/queue/memqueue/broker.go +++ b/libbeat/publisher/queue/memqueue/broker.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // Feature exposes a memory queue. diff --git a/libbeat/publisher/queue/memqueue/consume.go b/libbeat/publisher/queue/memqueue/consume.go index f225fc130066..300422751172 100644 --- a/libbeat/publisher/queue/memqueue/consume.go +++ b/libbeat/publisher/queue/memqueue/consume.go @@ -21,9 +21,9 @@ import ( "errors" "io" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type consumer struct { diff --git a/libbeat/publisher/queue/memqueue/internal_api.go b/libbeat/publisher/queue/memqueue/internal_api.go index c73260c2150a..d693645587f6 100644 --- a/libbeat/publisher/queue/memqueue/internal_api.go +++ b/libbeat/publisher/queue/memqueue/internal_api.go @@ -17,7 +17,7 @@ package memqueue -import "github.com/elastic/beats/libbeat/publisher" +import "github.com/elastic/beats/v7/libbeat/publisher" // producer -> broker API diff --git a/libbeat/publisher/queue/memqueue/produce.go b/libbeat/publisher/queue/memqueue/produce.go index 67c0c49f62ab..2838e1ce574b 100644 --- a/libbeat/publisher/queue/memqueue/produce.go +++ b/libbeat/publisher/queue/memqueue/produce.go @@ -18,10 +18,10 @@ package memqueue import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type forgetfulProducer struct { diff --git a/libbeat/publisher/queue/memqueue/queue_test.go b/libbeat/publisher/queue/memqueue/queue_test.go index eca1f1918caf..44d94d05bf47 100644 --- a/libbeat/publisher/queue/memqueue/queue_test.go +++ b/libbeat/publisher/queue/memqueue/queue_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" ) var seed int64 diff --git a/libbeat/publisher/queue/memqueue/ringbuf.go b/libbeat/publisher/queue/memqueue/ringbuf.go index 24af319c283d..202411c9c432 100644 --- a/libbeat/publisher/queue/memqueue/ringbuf.go +++ b/libbeat/publisher/queue/memqueue/ringbuf.go @@ -20,7 +20,7 @@ package memqueue import ( "fmt" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) // Internal event ring buffer. diff --git a/libbeat/publisher/queue/queue.go b/libbeat/publisher/queue/queue.go index eca5c0c499d6..a71304ec8b73 100644 --- a/libbeat/publisher/queue/queue.go +++ b/libbeat/publisher/queue/queue.go @@ -20,10 +20,10 @@ package queue import ( "io" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher" ) // Factory for creating a queue used by a pipeline instance. diff --git a/libbeat/publisher/queue/queue_reg.go b/libbeat/publisher/queue/queue_reg.go index d7690c006f3b..c4a9d446c521 100644 --- a/libbeat/publisher/queue/queue_reg.go +++ b/libbeat/publisher/queue/queue_reg.go @@ -18,7 +18,7 @@ package queue import ( - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/feature" ) // Namespace is the feature namespace for queue definition. diff --git a/libbeat/publisher/queue/queuetest/event.go b/libbeat/publisher/queue/queuetest/event.go index ff30f9609ab9..5a66fe050e23 100644 --- a/libbeat/publisher/queue/queuetest/event.go +++ b/libbeat/publisher/queue/queuetest/event.go @@ -20,9 +20,9 @@ package queuetest import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) func makeEvent(fields common.MapStr) publisher.Event { diff --git a/libbeat/publisher/queue/queuetest/log.go b/libbeat/publisher/queue/queuetest/log.go index af893a0cf08f..ba2c8e1f1ff6 100644 --- a/libbeat/publisher/queue/queuetest/log.go +++ b/libbeat/publisher/queue/queuetest/log.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var debug bool diff --git a/libbeat/publisher/queue/queuetest/producer_cancel.go b/libbeat/publisher/queue/queuetest/producer_cancel.go index baa0021bbe86..195c2de79f75 100644 --- a/libbeat/publisher/queue/queuetest/producer_cancel.go +++ b/libbeat/publisher/queue/queuetest/producer_cancel.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // TestSingleProducerConsumer tests buffered events for a producer getting diff --git a/libbeat/publisher/queue/queuetest/queuetest.go b/libbeat/publisher/queue/queuetest/queuetest.go index 4e4fefa81ade..fb5b04666b99 100644 --- a/libbeat/publisher/queue/queuetest/queuetest.go +++ b/libbeat/publisher/queue/queuetest/queuetest.go @@ -21,8 +21,8 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // QueueFactory is used to create a per test queue instance. diff --git a/libbeat/publisher/queue/spool/codec.go b/libbeat/publisher/queue/spool/codec.go index ea51e930b980..69f693a4817e 100644 --- a/libbeat/publisher/queue/spool/codec.go +++ b/libbeat/publisher/queue/spool/codec.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/publisher" "github.com/elastic/go-structform" "github.com/elastic/go-structform/cborl" "github.com/elastic/go-structform/gotype" diff --git a/libbeat/publisher/queue/spool/codec_test.go b/libbeat/publisher/queue/spool/codec_test.go index 3588d3e2f21c..6460985f6c30 100644 --- a/libbeat/publisher/queue/spool/codec_test.go +++ b/libbeat/publisher/queue/spool/codec_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) func TestEncodeDecode(t *testing.T) { diff --git a/libbeat/publisher/queue/spool/config.go b/libbeat/publisher/queue/spool/config.go index e936bae1f7bf..1d9d9a3299d4 100644 --- a/libbeat/publisher/queue/spool/config.go +++ b/libbeat/publisher/queue/spool/config.go @@ -27,7 +27,7 @@ import ( "github.com/dustin/go-humanize" "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" ) type config struct { diff --git a/libbeat/publisher/queue/spool/consume.go b/libbeat/publisher/queue/spool/consume.go index a8f55775cb92..74f3058f739f 100644 --- a/libbeat/publisher/queue/spool/consume.go +++ b/libbeat/publisher/queue/spool/consume.go @@ -21,9 +21,9 @@ import ( "errors" "io" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type consumer struct { diff --git a/libbeat/publisher/queue/spool/inbroker.go b/libbeat/publisher/queue/spool/inbroker.go index 784880ea847e..529c13c00c68 100644 --- a/libbeat/publisher/queue/spool/inbroker.go +++ b/libbeat/publisher/queue/spool/inbroker.go @@ -22,7 +22,7 @@ import ( "math" "time" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/internal_api.go b/libbeat/publisher/queue/spool/internal_api.go index e4a38b317d3c..a6fd97102d4b 100644 --- a/libbeat/publisher/queue/spool/internal_api.go +++ b/libbeat/publisher/queue/spool/internal_api.go @@ -18,7 +18,7 @@ package spool import ( - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) // producer -> broker API diff --git a/libbeat/publisher/queue/spool/log.go b/libbeat/publisher/queue/spool/log.go index f85bc035ec12..64150366b531 100644 --- a/libbeat/publisher/queue/spool/log.go +++ b/libbeat/publisher/queue/spool/log.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type logger interface { diff --git a/libbeat/publisher/queue/spool/module.go b/libbeat/publisher/queue/spool/module.go index 6e76d8033065..dc9902e156f7 100644 --- a/libbeat/publisher/queue/spool/module.go +++ b/libbeat/publisher/queue/spool/module.go @@ -18,12 +18,12 @@ package spool import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile" ) diff --git a/libbeat/publisher/queue/spool/outbroker.go b/libbeat/publisher/queue/spool/outbroker.go index e29a2b4edbb7..409b2cde3885 100644 --- a/libbeat/publisher/queue/spool/outbroker.go +++ b/libbeat/publisher/queue/spool/outbroker.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/produce.go b/libbeat/publisher/queue/spool/produce.go index fb2efb8d5841..81e12a18d02e 100644 --- a/libbeat/publisher/queue/spool/produce.go +++ b/libbeat/publisher/queue/spool/produce.go @@ -20,10 +20,10 @@ package spool import ( "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // forgetfulProducer forwards event to the inBroker. The forgetfulProducer diff --git a/libbeat/publisher/queue/spool/spool.go b/libbeat/publisher/queue/spool/spool.go index fe3d260a9b7c..69ae19ecd156 100644 --- a/libbeat/publisher/queue/spool/spool.go +++ b/libbeat/publisher/queue/spool/spool.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/spool_test.go b/libbeat/publisher/queue/spool/spool_test.go index 612fc0247811..8a8b466c2a1c 100644 --- a/libbeat/publisher/queue/spool/spool_test.go +++ b/libbeat/publisher/queue/spool/spool_test.go @@ -26,8 +26,8 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" "github.com/elastic/go-txfile" "github.com/elastic/go-txfile/txfiletest" ) diff --git a/libbeat/publisher/testing/testing.go b/libbeat/publisher/testing/testing.go index 87a1ac2c0bd6..401aa833c9d5 100644 --- a/libbeat/publisher/testing/testing.go +++ b/libbeat/publisher/testing/testing.go @@ -19,7 +19,7 @@ package testing // ChanClient implements Client interface, forwarding published events to some import ( - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type TestPublisher struct { diff --git a/libbeat/publisher/testing/testing_test.go b/libbeat/publisher/testing/testing_test.go index 6ade86c0d3ec..a7bffe0bb361 100644 --- a/libbeat/publisher/testing/testing_test.go +++ b/libbeat/publisher/testing/testing_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var cnt = 0 diff --git a/libbeat/reader/debug/debug.go b/libbeat/reader/debug/debug.go index 31012158dc57..5e0b1e7c93a5 100644 --- a/libbeat/reader/debug/debug.go +++ b/libbeat/reader/debug/debug.go @@ -21,7 +21,7 @@ import ( "bytes" "io" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/reader/debug/debug_test.go b/libbeat/reader/debug/debug_test.go index deb89eb08349..ac6b6878c9b1 100644 --- a/libbeat/reader/debug/debug_test.go +++ b/libbeat/reader/debug/debug_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestMakeNullCheck(t *testing.T) { diff --git a/libbeat/reader/message.go b/libbeat/reader/message.go index a92bc9092ccf..344eacd54dfc 100644 --- a/libbeat/reader/message.go +++ b/libbeat/reader/message.go @@ -20,7 +20,7 @@ package reader import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Message represents a reader event with timestamp, content and actual number diff --git a/libbeat/reader/multiline/multiline.go b/libbeat/reader/multiline/multiline.go index cf3b586d1caa..a6054c765502 100644 --- a/libbeat/reader/multiline/multiline.go +++ b/libbeat/reader/multiline/multiline.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile" ) // MultiLine reader combining multiple line events into one multi-line event. diff --git a/libbeat/reader/multiline/multiline_config.go b/libbeat/reader/multiline/multiline_config.go index 94e9c447e9be..93c155c39071 100644 --- a/libbeat/reader/multiline/multiline_config.go +++ b/libbeat/reader/multiline/multiline_config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) // Config holds the options of multiline readers. diff --git a/libbeat/reader/multiline/multiline_test.go b/libbeat/reader/multiline/multiline_test.go index dd9071804c19..a17c79c53d6e 100644 --- a/libbeat/reader/multiline/multiline_test.go +++ b/libbeat/reader/multiline/multiline_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) type bufferSource struct{ buf *bytes.Buffer } diff --git a/libbeat/reader/readfile/encode.go b/libbeat/reader/readfile/encode.go index ada4ae91947b..d2cf3cce4be0 100644 --- a/libbeat/reader/readfile/encode.go +++ b/libbeat/reader/readfile/encode.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) // Reader produces lines by reading lines from an io.Reader diff --git a/libbeat/reader/readfile/encode_test.go b/libbeat/reader/readfile/encode_test.go index 36d3df433ec5..9d6205c229fa 100644 --- a/libbeat/reader/readfile/encode_test.go +++ b/libbeat/reader/readfile/encode_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) func TestEncodeLines(t *testing.T) { diff --git a/libbeat/reader/readfile/limit.go b/libbeat/reader/readfile/limit.go index 403dea958476..d547ff09dfe1 100644 --- a/libbeat/reader/readfile/limit.go +++ b/libbeat/reader/readfile/limit.go @@ -20,7 +20,7 @@ package readfile import ( "fmt" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) // Reader sets an upper limited on line length. Lines longer diff --git a/libbeat/reader/readfile/limit_test.go b/libbeat/reader/readfile/limit_test.go index 9f72d297475b..e310e151cf8a 100644 --- a/libbeat/reader/readfile/limit_test.go +++ b/libbeat/reader/readfile/limit_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) type mockReader struct { diff --git a/libbeat/reader/readfile/line.go b/libbeat/reader/readfile/line.go index 698aa3cff110..21d902c6eb84 100644 --- a/libbeat/reader/readfile/line.go +++ b/libbeat/reader/readfile/line.go @@ -24,8 +24,8 @@ import ( "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) // lineReader reads lines from underlying reader, decoding the input stream diff --git a/libbeat/reader/readfile/line_test.go b/libbeat/reader/readfile/line_test.go index 7ac684163c9c..13b13127a86a 100644 --- a/libbeat/reader/readfile/line_test.go +++ b/libbeat/reader/readfile/line_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) // Sample texts are from http://www.columbia.edu/~kermit/utf8.html diff --git a/libbeat/reader/readfile/strip_newline.go b/libbeat/reader/readfile/strip_newline.go index e815020dc6b1..97cc005da92c 100644 --- a/libbeat/reader/readfile/strip_newline.go +++ b/libbeat/reader/readfile/strip_newline.go @@ -20,7 +20,7 @@ package readfile import ( "bytes" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) // StripNewline reader removes the last trailing newline characters from diff --git a/libbeat/reader/readfile/timeout.go b/libbeat/reader/readfile/timeout.go index 80a3270ce05c..fd3d1c8ba7c9 100644 --- a/libbeat/reader/readfile/timeout.go +++ b/libbeat/reader/readfile/timeout.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) var ( diff --git a/libbeat/reader/readjson/docker_json.go b/libbeat/reader/readjson/docker_json.go index 57040d0b27ab..95c98bddbb88 100644 --- a/libbeat/reader/readjson/docker_json.go +++ b/libbeat/reader/readjson/docker_json.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader" ) // DockerJSONReader processor renames a given field diff --git a/libbeat/reader/readjson/docker_json_test.go b/libbeat/reader/readjson/docker_json_test.go index f87c138587f9..23cc862d9646 100644 --- a/libbeat/reader/readjson/docker_json_test.go +++ b/libbeat/reader/readjson/docker_json_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/reader" ) func TestDockerJSON(t *testing.T) { diff --git a/libbeat/reader/readjson/json.go b/libbeat/reader/readjson/json.go index a669b3f49ae0..3567c372ed81 100644 --- a/libbeat/reader/readjson/json.go +++ b/libbeat/reader/readjson/json.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/jsontransform" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader" ) // JSONReader parses JSON inputs diff --git a/libbeat/reader/readjson/json_test.go b/libbeat/reader/readjson/json_test.go index d6f82585e492..7d88b032c971 100644 --- a/libbeat/reader/readjson/json_test.go +++ b/libbeat/reader/readjson/json_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestUnmarshal(t *testing.T) { diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index b3a40efdee99..a5d28e6eec7d 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -3,7 +3,10 @@ BEAT_NAME?=libbeat## @packaging Name of the binary LICENSE?=ASL2 BEAT_TITLE?=${BEAT_NAME}## @packaging Title of the application -BEAT_PATH?=github.com/elastic/beats/${BEAT_NAME} +BEATS_ROOT?=github.com/elastic/beats +BEATS_ROOT_IMPORT_PATH?=${BEATS_ROOT}/v7 +BEAT_PATH?=${BEATS_ROOT}/${BEAT_NAME} +BEAT_IMPORT_PATH?=${BEATS_ROOT_IMPORT_PATH}/${BEAT_NAME} BEAT_PACKAGE_NAME?=${BEAT_NAME} BEAT_INDEX_PREFIX?=${BEAT_NAME} BEAT_URL?=https://www.elastic.co/products/beats/${BEAT_NAME} ## @packaging Link to the homepage of the application @@ -13,7 +16,7 @@ BEAT_VENDOR?=Elastic ## @packaging Name of the vendor of the application BEAT_GOPATH=$(firstword $(subst :, ,${GOPATH})) BEAT_REF_YAML?=true ES_BEATS?=..## @community_beat Must be set to ./vendor/github.com/elastic/beats. It must always be a relative path. -GOPACKAGES?=$(shell go list ${BEAT_PATH}/... | grep -v /vendor/ | grep -v /scripts/cmd/ ) +GOPACKAGES?=$(shell go list ${BEAT_IMPORT_PATH}/... | grep -v /scripts/cmd/ ) PACKER_TEMPLATES_DIR?=${ES_BEATS}/dev-tools/packer ## @Building Directory of templates that are used by "make release" NOTICE_FILE?=../NOTICE.txt LICENSE_FILE?=../licenses/APACHE-LICENSE-2.0.txt @@ -21,8 +24,12 @@ ELASTIC_LICENSE_FILE?=../licenses/ELASTIC-LICENSE.txt SECCOMP_BINARY?=${BEAT_NAME} SECCOMP_BLACKLIST?=${ES_BEATS}/libbeat/common/seccomp/seccomp-profiler-blacklist.txt SECCOMP_ALLOWLIST?=${ES_BEATS}/libbeat/common/seccomp/seccomp-profiler-allow.txt +INSTALL_FLAG?=-mod=vendor +INSTALL_CMD?=install ${INSTALL_FLAG} +export INSTALL_FLAG +export INSTALL_CMD MAGE_PRESENT := $(shell command -v mage 2> /dev/null) -MAGE_IMPORT_PATH?=github.com/elastic/beats/vendor/github.com/magefile/mage +MAGE_IMPORT_PATH?=github.com/magefile/mage export MAGE_IMPORT_PATH space:=$() # @@ -59,8 +66,8 @@ PKG_BUILD_DIR?=$(BUILD_DIR)/package${PKG_SUFFIX} PKG_UPLOAD_DIR?=$(BUILD_DIR)/upload COVERAGE_DIR?=${BUILD_DIR}/coverage COVERAGE_TOOL?=${BEAT_GOPATH}/bin/gotestcover -COVERAGE_TOOL_REPO?=github.com/elastic/beats/vendor/github.com/pierrre/gotestcover -TESTIFY_TOOL_REPO?=github.com/elastic/beats/vendor/github.com/stretchr/testify/assert +COVERAGE_TOOL_REPO?=github.com/pierrre/gotestcover +TESTIFY_TOOL_REPO?=github.com/stretchr/testify/assert NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ') GOBUILD_FLAGS?=-ldflags "-X github.com/elastic/beats/libbeat/version.buildTime=$(NOW) -X github.com/elastic/beats/libbeat/version.commit=$(COMMIT_ID)" GOIMPORTS=goimports @@ -70,7 +77,7 @@ GOLINT=golint GOLINT_REPO?=golang.org/x/lint/golint REVIEWDOG?=reviewdog -conf ${ES_BEATS}/reviewdog.yml REVIEWDOG_OPTIONS?=-diff "git diff master" -REVIEWDOG_REPO?=github.com/haya14busa/reviewdog/cmd/reviewdog +REVIEWDOG_REPO?=github.com/reviewdog/reviewdog/cmd/reviewdog PROCESSES?= 4 TIMEOUT?= 90 PYTHON_TEST_FILES?=$(shell find . -type f -name 'test_*.py' -not -path "*/build/*" -not -path "*/vendor/*" 2>/dev/null) @@ -121,19 +128,24 @@ include $(ES_BEATS)/dev-tools/make/mage.mk .DEFAULT_GOAL := ${BEAT_NAME} -${BEAT_NAME}: $(GOFILES_ALL) ## @build build the beat application +${BEAT_NAME}: $(GOFILES_ALL) update-yacc-vendor ## @build build the beat application go build $(GOBUILD_FLAGS) # Create test coverage binary -${BEAT_NAME}.test: $(GOFILES_ALL) +${BEAT_NAME}.test: $(GOFILES_ALL) update-yacc-vendor @go build -o /dev/null @go test $(RACE) -c -coverpkg ${GOPACKAGES_COMMA_SEP} +# Avoid running yacc to generate a parser for dependency. +.PHONY: update-yacc-vendor +update-yacc-vendor: + touch -c ../vendor/github.com/yuin/gopher-lua/parse/parser.go + .PHONY: crosscompile crosscompile: ## @build Cross-compile beat for the OS'es specified in GOX_OS variable. The binaries are placed in the build/bin directory. crosscompile: $(GOFILES) ifneq ($(shell [[ $(BEAT_NAME) == journalbeat ]] && echo true ),true) - go get github.com/mitchellh/gox + go install -mod=vendor github.com/mitchellh/gox mkdir -p ${BUILD_DIR}/bin gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS} endif @@ -156,13 +168,13 @@ endif .PHONY: fmt fmt: add-headers python-env ## @build Runs `goimports -l -w` and `autopep8`on the project's source code, modifying any files that do not match its style. - @go get $(GOIMPORTS_REPO) + @go ${INSTALL_CMD} $(GOIMPORTS_REPO) @goimports -local ${GOIMPORTS_LOCAL_PREFIX} -l -w ${GOFILES_NOVENDOR} @${FIND} -name '*.py' -exec ${PYTHON_ENV}/bin/autopep8 --in-place --max-line-length 120 {} \; .PHONY: lint lint: - @go get $(GOLINT_REPO) $(REVIEWDOG_REPO) + @go install -mod=vendor $(GOLINT_REPO) $(REVIEWDOG_REPO) $(REVIEWDOG) $(REVIEWDOG_OPTIONS) .PHONY: clean @@ -181,12 +193,14 @@ ci: ## @build Shortcut for continuous integration. This should always run befor # Preparation for tests .PHONY: prepare-tests -prepare-tests: +prepare-tests: update-yacc-vendor mkdir -p ${COVERAGE_DIR} # gotestcover is needed to fetch coverage for multiple packages - go get ${COVERAGE_TOOL_REPO} + go ${INSTALL_CMD} ${COVERAGE_TOOL_REPO} # testify is needed for unit and integration tests - go get ${TESTIFY_TOOL_REPO} + go ${INSTALL_CMD} ${TESTIFY_TOOL_REPO} + # Avoid running yacc to generate a parser for dependency. + touch -c ../vendor/github.com/yuin/gopher-lua/parse/parser.go.c .PHONY: unit-tests unit-tests: ## @testing Runs the unit tests with coverage. Race is not enabled for unit tests because tests run much slower. @@ -216,6 +230,7 @@ integration-tests-environment: prepare-tests build-image -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} \ -e TEST_ENVIRONMENT=${TEST_ENVIRONMENT} \ -e BEATS_DOCKER_INTEGRATION_TEST_ENV=${BEATS_DOCKER_INTEGRATION_TEST_ENV} \ + -e GOFLAGS=${INSTALL_FLAG} \ beat make integration-tests # Runs the system tests @@ -229,7 +244,13 @@ system-tests: prepare-tests ${BEAT_NAME}.test python-env .PHONY: system-tests-environment system-tests-environment: ## @testing Runs the system tests inside a virtual environment. This can be run on any docker-machine (local, remote) system-tests-environment: prepare-tests build-image - ${DOCKER_COMPOSE} run -e INTEGRATION_TESTS=1 -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} -e PYTHON_EXE=${PYTHON_EXE} beat make system-tests + ${DOCKER_COMPOSE} run \ + -e INTEGRATION_TESTS=1 \ + -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} \ + -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} \ + -e PYTHON_EXE=${PYTHON_EXE} \ + -e GOFLAGS=${INSTALL_FLAG} \ + beat make system-tests .PHONY: fast-system-tests fast-system-tests: ## @testing Runs system tests without coverage reports and in parallel @@ -442,7 +463,7 @@ help_variables: ## @help Show Makefile customizable variables. # SECCOMP_BINARY. .PHONY: seccomp seccomp: - @go get github.com/elastic/beats/vendor/github.com/elastic/go-seccomp-bpf/cmd/seccomp-profiler + @go ${INSTALL_CMD} github.com/elastic/go-seccomp-bpf/cmd/seccomp-profiler @test -f ${SECCOMP_BINARY} || (echo "${SECCOMP_BINARY} binary is not built."; false) seccomp-profiler \ -b "$(shell grep -v ^# "${SECCOMP_BLACKLIST}")" \ @@ -472,3 +493,7 @@ ifdef NO_COLLECT .PHONY: collect collect: endif + +.PHONY: vendor +vendor: + @mage vendor diff --git a/libbeat/scripts/cmd/global_fields/main.go b/libbeat/scripts/cmd/global_fields/main.go index b71a848d845a..914556e350ac 100644 --- a/libbeat/scripts/cmd/global_fields/main.go +++ b/libbeat/scripts/cmd/global_fields/main.go @@ -25,8 +25,8 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/generator/fields" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/libbeat/mapping" ) func main() { diff --git a/libbeat/scripts/cmd/global_fields/main_test.go b/libbeat/scripts/cmd/global_fields/main_test.go index cef6b68faeba..9c1e0b633f93 100644 --- a/libbeat/scripts/cmd/global_fields/main_test.go +++ b/libbeat/scripts/cmd/global_fields/main_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/generator/fields" + "github.com/elastic/beats/v7/libbeat/generator/fields" ) type testcase struct { diff --git a/libbeat/scripts/cmd/stress_pipeline/main.go b/libbeat/scripts/cmd/stress_pipeline/main.go index a0c0d81dbb62..49ba19c686c0 100644 --- a/libbeat/scripts/cmd/stress_pipeline/main.go +++ b/libbeat/scripts/cmd/stress_pipeline/main.go @@ -25,18 +25,18 @@ import ( _ "net/http/pprof" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - logpcfg "github.com/elastic/beats/libbeat/logp/configure" - _ "github.com/elastic/beats/libbeat/outputs/console" - _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/libbeat/outputs/fileout" - _ "github.com/elastic/beats/libbeat/outputs/logstash" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" - "github.com/elastic/beats/libbeat/service" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + logpcfg "github.com/elastic/beats/v7/libbeat/logp/configure" + _ "github.com/elastic/beats/v7/libbeat/outputs/console" + _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + _ "github.com/elastic/beats/v7/libbeat/outputs/fileout" + _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline/stress" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/spool" + "github.com/elastic/beats/v7/libbeat/service" ) var ( diff --git a/libbeat/service/service.go b/libbeat/service/service.go index 4063e5e6be79..2d88b25f7823 100644 --- a/libbeat/service/service.go +++ b/libbeat/service/service.go @@ -32,8 +32,8 @@ import ( "sync" "syscall" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // HandleSignals manages OS signals that ask the service/daemon to stop. diff --git a/libbeat/service/service_windows.go b/libbeat/service/service_windows.go index 74d1f8f4ea8d..649bf85cfa88 100644 --- a/libbeat/service/service_windows.go +++ b/libbeat/service/service_windows.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type beatService struct{} diff --git a/libbeat/template/config.go b/libbeat/template/config.go index 6d6d8426df9e..c9e963d6135f 100644 --- a/libbeat/template/config.go +++ b/libbeat/template/config.go @@ -17,7 +17,7 @@ package template -import "github.com/elastic/beats/libbeat/mapping" +import "github.com/elastic/beats/v7/libbeat/mapping" // TemplateConfig holds config information about the Elasticsearch template type TemplateConfig struct { diff --git a/libbeat/template/load.go b/libbeat/template/load.go index 2a63c9efb397..88244fb11510 100644 --- a/libbeat/template/load.go +++ b/libbeat/template/load.go @@ -25,10 +25,10 @@ import ( "os" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) //Loader interface for loading templates diff --git a/libbeat/template/load_integration_test.go b/libbeat/template/load_integration_test.go index ae393010f0db..958b311057f7 100644 --- a/libbeat/template/load_integration_test.go +++ b/libbeat/template/load_integration_test.go @@ -32,11 +32,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/estest" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/estest" + "github.com/elastic/beats/v7/libbeat/version" ) func init() { diff --git a/libbeat/template/load_test.go b/libbeat/template/load_test.go index 97c11b8dfce7..75096e559f29 100644 --- a/libbeat/template/load_test.go +++ b/libbeat/template/load_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go index 48593ad4317c..30e8bdd8b1c6 100644 --- a/libbeat/template/processor.go +++ b/libbeat/template/processor.go @@ -21,8 +21,8 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) // Processor struct to process fields to template diff --git a/libbeat/template/processor_test.go b/libbeat/template/processor_test.go index dd316957e24e..55859403ec56 100644 --- a/libbeat/template/processor_test.go +++ b/libbeat/template/processor_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) func TestProcessor(t *testing.T) { diff --git a/libbeat/template/template.go b/libbeat/template/template.go index 83d393b293a1..b11599eb205c 100644 --- a/libbeat/template/template.go +++ b/libbeat/template/template.go @@ -24,10 +24,10 @@ import ( "github.com/elastic/go-ucfg/yaml" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/template/template_test.go b/libbeat/template/template_test.go index 70cd3e14ad7e..7e6a688db5d6 100644 --- a/libbeat/template/template_test.go +++ b/libbeat/template/template_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/version" ) type testTemplate struct { diff --git a/libbeat/tests/compose/project.go b/libbeat/tests/compose/project.go index f4ebfb904e58..566f12bb7d86 100644 --- a/libbeat/tests/compose/project.go +++ b/libbeat/tests/compose/project.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // CreateOptions are the options when containers are created diff --git a/libbeat/tests/compose/wrapper.go b/libbeat/tests/compose/wrapper.go index 35e37098a38c..b36e48b2346c 100644 --- a/libbeat/tests/compose/wrapper.go +++ b/libbeat/tests/compose/wrapper.go @@ -37,7 +37,7 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) const ( diff --git a/libbeat/tests/docker/docker.go b/libbeat/tests/docker/docker.go index afa18317eb9d..b81ffa285ea4 100644 --- a/libbeat/tests/docker/docker.go +++ b/libbeat/tests/docker/docker.go @@ -26,7 +26,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Client for Docker diff --git a/libbeat/tests/system/template/template.go b/libbeat/tests/system/template/template.go index 33d690e6ad61..3005662d195b 100644 --- a/libbeat/tests/system/template/template.go +++ b/libbeat/tests/system/template/template.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/template" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v7/libbeat/version" ) // MaxDefaultFieldLength is the limit on the number of default_field values diff --git a/magefile.go b/magefile.go index c09718d94d88..6806d57d4041 100644 --- a/magefile.go +++ b/magefile.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/elastic/beats/generator/common/beatgen" + "github.com/elastic/beats/v7/generator/common/beatgen" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/gotool" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( @@ -109,8 +109,8 @@ func AddLicenseHeaders() error { licenser( licenser.License("ASL2"), licenser.Exclude("x-pack"), - licenser.Exclude("generator/beat/{beat}"), - licenser.Exclude("generator/metricbeat/{beat}"), + licenser.Exclude("generator/_templates/beat/{beat}"), + licenser.Exclude("generator/_templates/metricbeat/{beat}"), ), licenser( licenser.License("Elastic"), @@ -133,9 +133,9 @@ func CheckLicenseHeaders() error { licenser.Check(), licenser.License("ASL2"), licenser.Exclude("x-pack"), - licenser.Exclude("generator/beat/{beat}"), - licenser.Exclude("generator/metricbeat/{beat}"), - licenser.Exclude("generator/beat/{beat}"), + licenser.Exclude("generator/_templates/beat/{beat}"), + licenser.Exclude("generator/_templates/metricbeat/{beat}"), + licenser.Exclude("generator/_templates/beat/{beat}"), ), licenser( licenser.Check(), @@ -149,3 +149,8 @@ func CheckLicenseHeaders() error { func DumpVariables() error { return devtools.DumpVariables() } + +// Vendor moves dependencies to the repo using go modules. +func Vendor() error { + return devtools.Vendor() +} diff --git a/metricbeat/Makefile b/metricbeat/Makefile index cc7d31f62da2..fd2c60935e76 100644 --- a/metricbeat/Makefile +++ b/metricbeat/Makefile @@ -74,9 +74,9 @@ test-module: python-env update metricbeat.test .PHONY: assets assets: - go run ${ES_BEATS}/metricbeat/scripts/assets/assets.go ${ES_BEATS}/metricbeat/module + go run ${INSTALL_FLAG} ${ES_BEATS}/metricbeat/scripts/assets/assets.go ${ES_BEATS}/metricbeat/module mkdir -p include/fields - go run ${ES_BEATS}/libbeat/scripts/cmd/global_fields/main.go -es_beats_path ${ES_BEATS} -beat_path ${PWD} | go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license ${LICENSE} -out ./include/fields/fields.go -pkg include -priority asset.LibbeatFieldsPri ${ES_BEATS}/libbeat/fields.yml $(BEAT_NAME) + go run ${INSTALL_FLAG} ${ES_BEATS}/libbeat/scripts/cmd/global_fields/main.go -es_beats_path ${ES_BEATS} -beat_path ${PWD} | go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license ${LICENSE} -out ./include/fields/fields.go -pkg include -priority asset.LibbeatFieldsPri ${ES_BEATS}/libbeat/fields.yml $(BEAT_NAME) .PHONY: integration-tests integration-tests: ## @testing Run golang integration tests. diff --git a/metricbeat/autodiscover/appender/kubernetes/token/config.go b/metricbeat/autodiscover/appender/kubernetes/token/config.go index 7e1271a6e3f1..7363c600b07c 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/config.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/config.go @@ -18,7 +18,7 @@ package token import ( - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/conditions" ) type config struct { diff --git a/metricbeat/autodiscover/appender/kubernetes/token/token.go b/metricbeat/autodiscover/appender/kubernetes/token/token.go index 5471f874ca9b..9f4f99c45833 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/token.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/token.go @@ -21,12 +21,12 @@ import ( "fmt" "io/ioutil" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/metricbeat/autodiscover/appender/kubernetes/token/token_test.go b/metricbeat/autodiscover/appender/kubernetes/token/token_test.go index 4a9f80592e8b..28b0ecb611ea 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/token_test.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/token_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestTokenAppender(t *testing.T) { diff --git a/metricbeat/autodiscover/builder/hints/config.go b/metricbeat/autodiscover/builder/hints/config.go index f3a33b128d04..957ec278d7d0 100644 --- a/metricbeat/autodiscover/builder/hints/config.go +++ b/metricbeat/autodiscover/builder/hints/config.go @@ -17,7 +17,7 @@ package hints -import "github.com/elastic/beats/metricbeat/mb" +import "github.com/elastic/beats/v7/metricbeat/mb" type config struct { Key string `config:"key"` diff --git a/metricbeat/autodiscover/builder/hints/metrics.go b/metricbeat/autodiscover/builder/hints/metrics.go index 247d30468604..3e859b23d118 100644 --- a/metricbeat/autodiscover/builder/hints/metrics.go +++ b/metricbeat/autodiscover/builder/hints/metrics.go @@ -22,13 +22,13 @@ import ( "strings" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/autodiscover/builder/hints/metrics_test.go b/metricbeat/autodiscover/builder/hints/metrics_test.go index 1f3d37c86bf6..f3f9d5a5200a 100644 --- a/metricbeat/autodiscover/builder/hints/metrics_test.go +++ b/metricbeat/autodiscover/builder/hints/metrics_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestGenerateHints(t *testing.T) { diff --git a/metricbeat/autodiscover/include.go b/metricbeat/autodiscover/include.go index 37d6a683ac7a..0843fe6c156f 100644 --- a/metricbeat/autodiscover/include.go +++ b/metricbeat/autodiscover/include.go @@ -19,8 +19,8 @@ package autodiscover import ( // include all metricbeat specific builders - _ "github.com/elastic/beats/metricbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints" // include all metricbeat specific appenders - _ "github.com/elastic/beats/metricbeat/autodiscover/appender/kubernetes/token" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover/appender/kubernetes/token" ) diff --git a/metricbeat/beater/config.go b/metricbeat/beater/config.go index bdf0786ade4d..51ac82aaa2da 100644 --- a/metricbeat/beater/config.go +++ b/metricbeat/beater/config.go @@ -20,8 +20,8 @@ package beater import ( "time" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" ) // Config is the root of the Metricbeat configuration hierarchy. diff --git a/metricbeat/beater/doc.go b/metricbeat/beater/doc.go index e63709050029..21d475c77e6a 100644 --- a/metricbeat/beater/doc.go +++ b/metricbeat/beater/doc.go @@ -25,7 +25,7 @@ called a Module. Each Module has one or more MetricSet implementations which do the work of collecting a particular set of metrics from the service. The public interfaces used in implementing Modules and MetricSets are defined in -the github.com/elastic/beats/metricbeat/mb package. +the github.com/elastic/beats/v7/metricbeat/mb package. Event Format diff --git a/metricbeat/beater/metricbeat.go b/metricbeat/beater/metricbeat.go index f7f79f7e42a0..b396ac19c4bf 100644 --- a/metricbeat/beater/metricbeat.go +++ b/metricbeat/beater/metricbeat.go @@ -22,22 +22,22 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" // Add autodiscover builders / appenders - _ "github.com/elastic/beats/metricbeat/autodiscover" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover" // Add metricbeat default processors - _ "github.com/elastic/beats/metricbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/metricbeat/processor/add_kubernetes_metadata" ) // Metricbeat implements the Beater interface for metricbeat. diff --git a/metricbeat/cmd/modules.go b/metricbeat/cmd/modules.go index 608eb47fc7b7..f137a91c37b7 100644 --- a/metricbeat/cmd/modules.go +++ b/metricbeat/cmd/modules.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" ) // BuildModulesManager adds support for modules management to a beat diff --git a/metricbeat/cmd/root.go b/metricbeat/cmd/root.go index 8fb81dc82627..892d734b8e24 100644 --- a/metricbeat/cmd/root.go +++ b/metricbeat/cmd/root.go @@ -22,17 +22,17 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/cmd/test" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/cmd/test" // import modules - _ "github.com/elastic/beats/metricbeat/include" - _ "github.com/elastic/beats/metricbeat/include/fields" + _ "github.com/elastic/beats/v7/metricbeat/include" + _ "github.com/elastic/beats/v7/metricbeat/include/fields" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/script" ) // Name of this beat diff --git a/metricbeat/cmd/test/modules.go b/metricbeat/cmd/test/modules.go index f2cafc5b43cd..93950973a5dc 100644 --- a/metricbeat/cmd/test/modules.go +++ b/metricbeat/cmd/test/modules.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/testing" - "github.com/elastic/beats/metricbeat/beater" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v7/metricbeat/beater" ) func GenTestModulesCmd(name, beatVersion string, create beat.Creator) *cobra.Command { diff --git a/metricbeat/helper/config.go b/metricbeat/helper/config.go index 1c4c8fd6ddcd..8581c45a0155 100644 --- a/metricbeat/helper/config.go +++ b/metricbeat/helper/config.go @@ -20,7 +20,7 @@ package helper import ( "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Config for an HTTP helper diff --git a/metricbeat/helper/dialer/dialer.go b/metricbeat/helper/dialer/dialer.go index d2aaf0b6ed9b..05c723fff4ff 100644 --- a/metricbeat/helper/dialer/dialer.go +++ b/metricbeat/helper/dialer/dialer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Builder is a dialer builder. diff --git a/metricbeat/helper/dialer/dialer_posix.go b/metricbeat/helper/dialer/dialer_posix.go index 4b6f61d1bfb0..2a320ce2525b 100644 --- a/metricbeat/helper/dialer/dialer_posix.go +++ b/metricbeat/helper/dialer/dialer_posix.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // UnixDialerBuilder creates a builder to dial over unix domain socket. diff --git a/metricbeat/helper/dialer/dialer_windows.go b/metricbeat/helper/dialer/dialer_windows.go index 421f91a6017d..873a853e593e 100644 --- a/metricbeat/helper/dialer/dialer_windows.go +++ b/metricbeat/helper/dialer/dialer_windows.go @@ -28,8 +28,8 @@ import ( winio "github.com/Microsoft/go-winio" - "github.com/elastic/beats/libbeat/api/npipe" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // UnixDialerBuilder creates a builder to dial over a unix domain socket. diff --git a/metricbeat/helper/elastic/elastic.go b/metricbeat/helper/elastic/elastic.go index 46cb9d48de58..b4b9f6195ab7 100644 --- a/metricbeat/helper/elastic/elastic.go +++ b/metricbeat/helper/elastic/elastic.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Product supported by X-Pack Monitoring diff --git a/metricbeat/helper/elastic/elastic_test.go b/metricbeat/helper/elastic/elastic_test.go index c0de5ea8809b..14f6a119eb79 100644 --- a/metricbeat/helper/elastic/elastic_test.go +++ b/metricbeat/helper/elastic/elastic_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestMakeXPackMonitoringIndexName(t *testing.T) { diff --git a/metricbeat/helper/http.go b/metricbeat/helper/http.go index 1dde8cd3a622..5b969fab404e 100644 --- a/metricbeat/helper/http.go +++ b/metricbeat/helper/http.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) // HTTP is a custom HTTP Client that handle the complexity of connection and retrieving information diff --git a/metricbeat/helper/http_test.go b/metricbeat/helper/http_test.go index bb6781eb9163..efbecffd93fe 100644 --- a/metricbeat/helper/http_test.go +++ b/metricbeat/helper/http_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestGetAuthHeaderFromToken(t *testing.T) { diff --git a/metricbeat/helper/http_windows_test.go b/metricbeat/helper/http_windows_test.go index 3d01f9c9a3b5..388eace429bb 100644 --- a/metricbeat/helper/http_windows_test.go +++ b/metricbeat/helper/http_windows_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/api/npipe" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestOverNamedpipe(t *testing.T) { diff --git a/metricbeat/helper/privileges_windows.go b/metricbeat/helper/privileges_windows.go index 9e182a8cde3f..625daf59748a 100644 --- a/metricbeat/helper/privileges_windows.go +++ b/metricbeat/helper/privileges_windows.go @@ -25,7 +25,7 @@ import ( "github.com/elastic/gosigar/sys/windows" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var once sync.Once diff --git a/metricbeat/helper/prometheus/hash.go b/metricbeat/helper/prometheus/hash.go index 6ed7a8ed2405..2efe5f195920 100644 --- a/metricbeat/helper/prometheus/hash.go +++ b/metricbeat/helper/prometheus/hash.go @@ -23,9 +23,9 @@ import ( "strconv" "sync" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const sep = '\xff' diff --git a/metricbeat/helper/prometheus/hash_benchmark_test.go b/metricbeat/helper/prometheus/hash_benchmark_test.go index cd41d2af976c..edecb5cb54b7 100644 --- a/metricbeat/helper/prometheus/hash_benchmark_test.go +++ b/metricbeat/helper/prometheus/hash_benchmark_test.go @@ -20,7 +20,7 @@ package prometheus import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var testLabels = common.MapStr{ diff --git a/metricbeat/helper/prometheus/metric.go b/metricbeat/helper/prometheus/metric.go index 57cd395724c7..ee34c1137468 100644 --- a/metricbeat/helper/prometheus/metric.go +++ b/metricbeat/helper/prometheus/metric.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" dto "github.com/prometheus/client_model/go" ) diff --git a/metricbeat/helper/prometheus/module.go b/metricbeat/helper/prometheus/module.go index da1ea895f257..cc6b7d2a068c 100644 --- a/metricbeat/helper/prometheus/module.go +++ b/metricbeat/helper/prometheus/module.go @@ -18,8 +18,8 @@ package prometheus import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/helper/prometheus/prometheus.go b/metricbeat/helper/prometheus/prometheus.go index 6709e6c93eff..6da2b91c4f34 100644 --- a/metricbeat/helper/prometheus/prometheus.go +++ b/metricbeat/helper/prometheus/prometheus.go @@ -27,10 +27,10 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Prometheus helper retrieves prometheus formatted metrics diff --git a/metricbeat/helper/prometheus/prometheus_test.go b/metricbeat/helper/prometheus/prometheus_test.go index 20715b67750d..b1557115d83e 100644 --- a/metricbeat/helper/prometheus/prometheus_test.go +++ b/metricbeat/helper/prometheus/prometheus_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/helper/prometheus/ptest/ptest.go b/metricbeat/helper/prometheus/ptest/ptest.go index ab7940cc2210..c59c62c40505 100644 --- a/metricbeat/helper/prometheus/ptest/ptest.go +++ b/metricbeat/helper/prometheus/ptest/ptest.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" ) // TestCases holds the list of test cases to test a metricset diff --git a/metricbeat/helper/server/http/config.go b/metricbeat/helper/server/http/config.go index 5f70317fcc79..726e1ca4dbbf 100644 --- a/metricbeat/helper/server/http/config.go +++ b/metricbeat/helper/server/http/config.go @@ -17,7 +17,7 @@ package http -import "github.com/elastic/beats/libbeat/common/transport/tlscommon" +import "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" type HttpConfig struct { Host string `config:"host"` diff --git a/metricbeat/helper/server/http/http.go b/metricbeat/helper/server/http/http.go index 5ecfb32c70a4..b67209c53440 100644 --- a/metricbeat/helper/server/http/http.go +++ b/metricbeat/helper/server/http/http.go @@ -24,11 +24,11 @@ import ( "net/http" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type HttpServer struct { diff --git a/metricbeat/helper/server/http/http_test.go b/metricbeat/helper/server/http/http_test.go index 501bfb0d98d9..7b7a0a2c7f3c 100644 --- a/metricbeat/helper/server/http/http_test.go +++ b/metricbeat/helper/server/http/http_test.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func TestHTTPServers(t *testing.T) { diff --git a/metricbeat/helper/server/server.go b/metricbeat/helper/server/server.go index 70e903f9db83..3f3fb52c4911 100644 --- a/metricbeat/helper/server/server.go +++ b/metricbeat/helper/server/server.go @@ -17,7 +17,7 @@ package server -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type Meta common.MapStr diff --git a/metricbeat/helper/server/tcp/tcp.go b/metricbeat/helper/server/tcp/tcp.go index e4455758368c..a0afc51fb09f 100644 --- a/metricbeat/helper/server/tcp/tcp.go +++ b/metricbeat/helper/server/tcp/tcp.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type TcpServer struct { diff --git a/metricbeat/helper/server/tcp/tcp_test.go b/metricbeat/helper/server/tcp/tcp_test.go index 27ad81a060fc..637dba54159e 100644 --- a/metricbeat/helper/server/tcp/tcp_test.go +++ b/metricbeat/helper/server/tcp/tcp_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func GetTestTcpServer(host string, port int) (server.Server, error) { diff --git a/metricbeat/helper/server/udp/udp.go b/metricbeat/helper/server/udp/udp.go index 3d53fdde9aa2..e19f86975196 100644 --- a/metricbeat/helper/server/udp/udp.go +++ b/metricbeat/helper/server/udp/udp.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type UdpServer struct { diff --git a/metricbeat/helper/server/udp/udp_test.go b/metricbeat/helper/server/udp/udp_test.go index 6d288e8bc88b..2ead3294237f 100644 --- a/metricbeat/helper/server/udp/udp_test.go +++ b/metricbeat/helper/server/udp/udp_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func GetTestUdpServer(host string, port int) (server.Server, error) { diff --git a/metricbeat/helper/socket/ptable_linux.go b/metricbeat/helper/socket/ptable_linux.go index 091efe60bfea..f08e9fe61440 100644 --- a/metricbeat/helper/socket/ptable_linux.go +++ b/metricbeat/helper/socket/ptable_linux.go @@ -20,7 +20,7 @@ package socket import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var requiredCapabilities = []string{"sys_ptrace", "dac_read_search"} diff --git a/metricbeat/helper/windows/pdh/doc.go b/metricbeat/helper/windows/pdh/doc.go index fc6ec0cd1326..736bde4bec9a 100644 --- a/metricbeat/helper/windows/pdh/doc.go +++ b/metricbeat/helper/windows/pdh/doc.go @@ -21,4 +21,4 @@ package pdh //go:generate go run ../run.go -cmd "go tool cgo -godefs defs_pdh_windows.go" -goarch amd64 -output defs_pdh_windows_amd64.go //go:generate go run ../run.go -cmd "go tool cgo -godefs defs_pdh_windows.go" -goarch 386 -output defs_pdh_windows_386.go //go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zpdh_windows.go pdh_windows.go -//go:generate gofmt -w defs_pdh_windows_amd64.go defs_pdh_windows_386.go zpdh_windows.go +//go:generate goimports -w defs_pdh_windows_amd64.go defs_pdh_windows_386.go zpdh_windows.go diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index 75e43d7e3cfd..bbb4f4bd0f1d 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go index eb96b2f25c11..a44f3bdb7c99 100644 --- a/metricbeat/include/list_common.go +++ b/metricbeat/include/list_common.go @@ -21,152 +21,152 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/metricbeat/module/aerospike" - _ "github.com/elastic/beats/metricbeat/module/aerospike/namespace" - _ "github.com/elastic/beats/metricbeat/module/apache" - _ "github.com/elastic/beats/metricbeat/module/apache/status" - _ "github.com/elastic/beats/metricbeat/module/beat" - _ "github.com/elastic/beats/metricbeat/module/beat/state" - _ "github.com/elastic/beats/metricbeat/module/beat/stats" - _ "github.com/elastic/beats/metricbeat/module/ceph" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_disk" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_health" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_status" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_cluster_disk" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_cluster_health" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_osd_perf" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_osd_pool_stats" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_osd_tree" - _ "github.com/elastic/beats/metricbeat/module/ceph/mgr_pool_disk" - _ "github.com/elastic/beats/metricbeat/module/ceph/monitor_health" - _ "github.com/elastic/beats/metricbeat/module/ceph/osd_df" - _ "github.com/elastic/beats/metricbeat/module/ceph/osd_tree" - _ "github.com/elastic/beats/metricbeat/module/ceph/pool_disk" - _ "github.com/elastic/beats/metricbeat/module/consul" - _ "github.com/elastic/beats/metricbeat/module/consul/agent" - _ "github.com/elastic/beats/metricbeat/module/couchbase" - _ "github.com/elastic/beats/metricbeat/module/couchbase/bucket" - _ "github.com/elastic/beats/metricbeat/module/couchbase/cluster" - _ "github.com/elastic/beats/metricbeat/module/couchbase/node" - _ "github.com/elastic/beats/metricbeat/module/couchdb" - _ "github.com/elastic/beats/metricbeat/module/couchdb/server" - _ "github.com/elastic/beats/metricbeat/module/dropwizard" - _ "github.com/elastic/beats/metricbeat/module/dropwizard/collector" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/pending_tasks" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/shard" - _ "github.com/elastic/beats/metricbeat/module/envoyproxy" - _ "github.com/elastic/beats/metricbeat/module/envoyproxy/server" - _ "github.com/elastic/beats/metricbeat/module/etcd" - _ "github.com/elastic/beats/metricbeat/module/etcd/leader" - _ "github.com/elastic/beats/metricbeat/module/etcd/metrics" - _ "github.com/elastic/beats/metricbeat/module/etcd/self" - _ "github.com/elastic/beats/metricbeat/module/etcd/store" - _ "github.com/elastic/beats/metricbeat/module/golang" - _ "github.com/elastic/beats/metricbeat/module/golang/expvar" - _ "github.com/elastic/beats/metricbeat/module/golang/heap" - _ "github.com/elastic/beats/metricbeat/module/graphite" - _ "github.com/elastic/beats/metricbeat/module/graphite/server" - _ "github.com/elastic/beats/metricbeat/module/haproxy" - _ "github.com/elastic/beats/metricbeat/module/haproxy/info" - _ "github.com/elastic/beats/metricbeat/module/haproxy/stat" - _ "github.com/elastic/beats/metricbeat/module/http" - _ "github.com/elastic/beats/metricbeat/module/http/json" - _ "github.com/elastic/beats/metricbeat/module/http/server" - _ "github.com/elastic/beats/metricbeat/module/iis" - _ "github.com/elastic/beats/metricbeat/module/iis/application_pool" - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" - _ "github.com/elastic/beats/metricbeat/module/kafka" - _ "github.com/elastic/beats/metricbeat/module/kafka/consumergroup" - _ "github.com/elastic/beats/metricbeat/module/kafka/partition" - _ "github.com/elastic/beats/metricbeat/module/kibana" - _ "github.com/elastic/beats/metricbeat/module/kibana/stats" - _ "github.com/elastic/beats/metricbeat/module/kibana/status" - _ "github.com/elastic/beats/metricbeat/module/kvm" - _ "github.com/elastic/beats/metricbeat/module/kvm/dommemstat" - _ "github.com/elastic/beats/metricbeat/module/logstash" - _ "github.com/elastic/beats/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/metricbeat/module/logstash/node_stats" - _ "github.com/elastic/beats/metricbeat/module/memcached" - _ "github.com/elastic/beats/metricbeat/module/memcached/stats" - _ "github.com/elastic/beats/metricbeat/module/mongodb" - _ "github.com/elastic/beats/metricbeat/module/mongodb/collstats" - _ "github.com/elastic/beats/metricbeat/module/mongodb/dbstats" - _ "github.com/elastic/beats/metricbeat/module/mongodb/metrics" - _ "github.com/elastic/beats/metricbeat/module/mongodb/replstatus" - _ "github.com/elastic/beats/metricbeat/module/mongodb/status" - _ "github.com/elastic/beats/metricbeat/module/munin" - _ "github.com/elastic/beats/metricbeat/module/munin/node" - _ "github.com/elastic/beats/metricbeat/module/mysql" - _ "github.com/elastic/beats/metricbeat/module/mysql/galera_status" - _ "github.com/elastic/beats/metricbeat/module/mysql/status" - _ "github.com/elastic/beats/metricbeat/module/nats" - _ "github.com/elastic/beats/metricbeat/module/nats/connections" - _ "github.com/elastic/beats/metricbeat/module/nats/routes" - _ "github.com/elastic/beats/metricbeat/module/nats/stats" - _ "github.com/elastic/beats/metricbeat/module/nats/subscriptions" - _ "github.com/elastic/beats/metricbeat/module/nginx" - _ "github.com/elastic/beats/metricbeat/module/nginx/stubstatus" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" - _ "github.com/elastic/beats/metricbeat/module/php_fpm/pool" - _ "github.com/elastic/beats/metricbeat/module/php_fpm/process" - _ "github.com/elastic/beats/metricbeat/module/postgresql" - _ "github.com/elastic/beats/metricbeat/module/postgresql/activity" - _ "github.com/elastic/beats/metricbeat/module/postgresql/bgwriter" - _ "github.com/elastic/beats/metricbeat/module/postgresql/database" - _ "github.com/elastic/beats/metricbeat/module/postgresql/statement" - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/connection" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/exchange" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/node" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/queue" - _ "github.com/elastic/beats/metricbeat/module/redis" - _ "github.com/elastic/beats/metricbeat/module/redis/info" - _ "github.com/elastic/beats/metricbeat/module/redis/key" - _ "github.com/elastic/beats/metricbeat/module/redis/keyspace" - _ "github.com/elastic/beats/metricbeat/module/system" - _ "github.com/elastic/beats/metricbeat/module/system/core" - _ "github.com/elastic/beats/metricbeat/module/system/cpu" - _ "github.com/elastic/beats/metricbeat/module/system/diskio" - _ "github.com/elastic/beats/metricbeat/module/system/entropy" - _ "github.com/elastic/beats/metricbeat/module/system/filesystem" - _ "github.com/elastic/beats/metricbeat/module/system/fsstat" - _ "github.com/elastic/beats/metricbeat/module/system/load" - _ "github.com/elastic/beats/metricbeat/module/system/memory" - _ "github.com/elastic/beats/metricbeat/module/system/network" - _ "github.com/elastic/beats/metricbeat/module/system/network_summary" - _ "github.com/elastic/beats/metricbeat/module/system/process" - _ "github.com/elastic/beats/metricbeat/module/system/process_summary" - _ "github.com/elastic/beats/metricbeat/module/system/raid" - _ "github.com/elastic/beats/metricbeat/module/system/service" - _ "github.com/elastic/beats/metricbeat/module/system/socket" - _ "github.com/elastic/beats/metricbeat/module/system/socket_summary" - _ "github.com/elastic/beats/metricbeat/module/system/uptime" - _ "github.com/elastic/beats/metricbeat/module/traefik" - _ "github.com/elastic/beats/metricbeat/module/traefik/health" - _ "github.com/elastic/beats/metricbeat/module/uwsgi" - _ "github.com/elastic/beats/metricbeat/module/uwsgi/status" - _ "github.com/elastic/beats/metricbeat/module/vsphere" - _ "github.com/elastic/beats/metricbeat/module/vsphere/datastore" - _ "github.com/elastic/beats/metricbeat/module/vsphere/host" - _ "github.com/elastic/beats/metricbeat/module/vsphere/virtualmachine" - _ "github.com/elastic/beats/metricbeat/module/windows" - _ "github.com/elastic/beats/metricbeat/module/windows/perfmon" - _ "github.com/elastic/beats/metricbeat/module/windows/service" - _ "github.com/elastic/beats/metricbeat/module/zookeeper" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/connection" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/mntr" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/server" + _ "github.com/elastic/beats/v7/metricbeat/module/aerospike" + _ "github.com/elastic/beats/v7/metricbeat/module/aerospike/namespace" + _ "github.com/elastic/beats/v7/metricbeat/module/apache" + _ "github.com/elastic/beats/v7/metricbeat/module/apache/status" + _ "github.com/elastic/beats/v7/metricbeat/module/beat" + _ "github.com/elastic/beats/v7/metricbeat/module/beat/state" + _ "github.com/elastic/beats/v7/metricbeat/module/beat/stats" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_disk" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_health" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_status" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_cluster_disk" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_cluster_health" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_perf" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_pool_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_tree" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_pool_disk" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/monitor_health" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/osd_df" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/osd_tree" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph/pool_disk" + _ "github.com/elastic/beats/v7/metricbeat/module/consul" + _ "github.com/elastic/beats/v7/metricbeat/module/consul/agent" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/bucket" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/cluster" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/node" + _ "github.com/elastic/beats/v7/metricbeat/module/couchdb" + _ "github.com/elastic/beats/v7/metricbeat/module/couchdb/server" + _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard" + _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ccr" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/cluster_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/enrich" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_recovery" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_summary" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ml_job" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/pending_tasks" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/shard" + _ "github.com/elastic/beats/v7/metricbeat/module/envoyproxy" + _ "github.com/elastic/beats/v7/metricbeat/module/envoyproxy/server" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd/leader" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd/metrics" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd/self" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd/store" + _ "github.com/elastic/beats/v7/metricbeat/module/golang" + _ "github.com/elastic/beats/v7/metricbeat/module/golang/expvar" + _ "github.com/elastic/beats/v7/metricbeat/module/golang/heap" + _ "github.com/elastic/beats/v7/metricbeat/module/graphite" + _ "github.com/elastic/beats/v7/metricbeat/module/graphite/server" + _ "github.com/elastic/beats/v7/metricbeat/module/haproxy" + _ "github.com/elastic/beats/v7/metricbeat/module/haproxy/info" + _ "github.com/elastic/beats/v7/metricbeat/module/haproxy/stat" + _ "github.com/elastic/beats/v7/metricbeat/module/http" + _ "github.com/elastic/beats/v7/metricbeat/module/http/json" + _ "github.com/elastic/beats/v7/metricbeat/module/http/server" + _ "github.com/elastic/beats/v7/metricbeat/module/iis" + _ "github.com/elastic/beats/v7/metricbeat/module/iis/application_pool" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/kafka" + _ "github.com/elastic/beats/v7/metricbeat/module/kafka/consumergroup" + _ "github.com/elastic/beats/v7/metricbeat/module/kafka/partition" + _ "github.com/elastic/beats/v7/metricbeat/module/kibana" + _ "github.com/elastic/beats/v7/metricbeat/module/kibana/stats" + _ "github.com/elastic/beats/v7/metricbeat/module/kibana/status" + _ "github.com/elastic/beats/v7/metricbeat/module/kvm" + _ "github.com/elastic/beats/v7/metricbeat/module/kvm/dommemstat" + _ "github.com/elastic/beats/v7/metricbeat/module/logstash" + _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node" + _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/memcached" + _ "github.com/elastic/beats/v7/metricbeat/module/memcached/stats" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/collstats" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/dbstats" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/metrics" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/replstatus" + _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/status" + _ "github.com/elastic/beats/v7/metricbeat/module/munin" + _ "github.com/elastic/beats/v7/metricbeat/module/munin/node" + _ "github.com/elastic/beats/v7/metricbeat/module/mysql" + _ "github.com/elastic/beats/v7/metricbeat/module/mysql/galera_status" + _ "github.com/elastic/beats/v7/metricbeat/module/mysql/status" + _ "github.com/elastic/beats/v7/metricbeat/module/nats" + _ "github.com/elastic/beats/v7/metricbeat/module/nats/connections" + _ "github.com/elastic/beats/v7/metricbeat/module/nats/routes" + _ "github.com/elastic/beats/v7/metricbeat/module/nats/stats" + _ "github.com/elastic/beats/v7/metricbeat/module/nats/subscriptions" + _ "github.com/elastic/beats/v7/metricbeat/module/nginx" + _ "github.com/elastic/beats/v7/metricbeat/module/nginx/stubstatus" + _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm/pool" + _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm/process" + _ "github.com/elastic/beats/v7/metricbeat/module/postgresql" + _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/activity" + _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/bgwriter" + _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/database" + _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/statement" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/connection" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/exchange" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/node" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/queue" + _ "github.com/elastic/beats/v7/metricbeat/module/redis" + _ "github.com/elastic/beats/v7/metricbeat/module/redis/info" + _ "github.com/elastic/beats/v7/metricbeat/module/redis/key" + _ "github.com/elastic/beats/v7/metricbeat/module/redis/keyspace" + _ "github.com/elastic/beats/v7/metricbeat/module/system" + _ "github.com/elastic/beats/v7/metricbeat/module/system/core" + _ "github.com/elastic/beats/v7/metricbeat/module/system/cpu" + _ "github.com/elastic/beats/v7/metricbeat/module/system/diskio" + _ "github.com/elastic/beats/v7/metricbeat/module/system/entropy" + _ "github.com/elastic/beats/v7/metricbeat/module/system/filesystem" + _ "github.com/elastic/beats/v7/metricbeat/module/system/fsstat" + _ "github.com/elastic/beats/v7/metricbeat/module/system/load" + _ "github.com/elastic/beats/v7/metricbeat/module/system/memory" + _ "github.com/elastic/beats/v7/metricbeat/module/system/network" + _ "github.com/elastic/beats/v7/metricbeat/module/system/network_summary" + _ "github.com/elastic/beats/v7/metricbeat/module/system/process" + _ "github.com/elastic/beats/v7/metricbeat/module/system/process_summary" + _ "github.com/elastic/beats/v7/metricbeat/module/system/raid" + _ "github.com/elastic/beats/v7/metricbeat/module/system/service" + _ "github.com/elastic/beats/v7/metricbeat/module/system/socket" + _ "github.com/elastic/beats/v7/metricbeat/module/system/socket_summary" + _ "github.com/elastic/beats/v7/metricbeat/module/system/uptime" + _ "github.com/elastic/beats/v7/metricbeat/module/traefik" + _ "github.com/elastic/beats/v7/metricbeat/module/traefik/health" + _ "github.com/elastic/beats/v7/metricbeat/module/uwsgi" + _ "github.com/elastic/beats/v7/metricbeat/module/uwsgi/status" + _ "github.com/elastic/beats/v7/metricbeat/module/vsphere" + _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/datastore" + _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/host" + _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/virtualmachine" + _ "github.com/elastic/beats/v7/metricbeat/module/windows" + _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v7/metricbeat/module/windows/service" + _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper" + _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/connection" + _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/mntr" + _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/server" ) diff --git a/metricbeat/include/list_docker.go b/metricbeat/include/list_docker.go index f0015d31b3b6..18a34924bd84 100644 --- a/metricbeat/include/list_docker.go +++ b/metricbeat/include/list_docker.go @@ -23,35 +23,35 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/metricbeat/module/docker/container" - _ "github.com/elastic/beats/metricbeat/module/docker/cpu" - _ "github.com/elastic/beats/metricbeat/module/docker/diskio" - _ "github.com/elastic/beats/metricbeat/module/docker/event" - _ "github.com/elastic/beats/metricbeat/module/docker/healthcheck" - _ "github.com/elastic/beats/metricbeat/module/docker/image" - _ "github.com/elastic/beats/metricbeat/module/docker/info" - _ "github.com/elastic/beats/metricbeat/module/docker/memory" - _ "github.com/elastic/beats/metricbeat/module/docker/network" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/apiserver" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/container" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/controllermanager" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/event" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/node" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/pod" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/proxy" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/scheduler" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_container" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_cronjob" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_deployment" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_node" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_persistentvolume" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_persistentvolumeclaim" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_pod" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_replicaset" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_resourcequota" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_service" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_statefulset" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_storageclass" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/system" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/volume" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/container" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/cpu" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/diskio" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/event" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/healthcheck" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/image" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/info" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/memory" + _ "github.com/elastic/beats/v7/metricbeat/module/docker/network" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/apiserver" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/container" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/controllermanager" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/event" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/node" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/pod" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/proxy" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/scheduler" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_container" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_cronjob" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_deployment" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_node" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_persistentvolume" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_persistentvolumeclaim" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_pod" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_replicaset" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_resourcequota" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_service" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_statefulset" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_storageclass" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/system" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/volume" ) diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 1b84d3cc3dc4..2f955efb7253 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -28,27 +28,27 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" // mage:import - build "github.com/elastic/beats/dev-tools/mage/target/build" + build "github.com/elastic/beats/v7/dev-tools/mage/target/build" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/docs" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/docs" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - update "github.com/elastic/beats/dev-tools/mage/target/update" + update "github.com/elastic/beats/v7/dev-tools/mage/target/update" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/compose" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/compose" ) func init() { @@ -114,7 +114,7 @@ func configYML() error { func MockedTests(ctx context.Context) error { params := devtools.DefaultGoTestUnitArgs() - params.ExtraFlags = []string{"github.com/elastic/beats/metricbeat/mb/testing/data/."} + params.ExtraFlags = []string{"github.com/elastic/beats/v7/metricbeat/mb/testing/data/."} if module := os.Getenv("MODULE"); module != "" { params.ExtraFlags = append(params.ExtraFlags, "-module="+module) diff --git a/metricbeat/main.go b/metricbeat/main.go index bba266fd14b9..749ec8001bdd 100644 --- a/metricbeat/main.go +++ b/metricbeat/main.go @@ -27,7 +27,7 @@ package main import ( "os" - "github.com/elastic/beats/metricbeat/cmd" + "github.com/elastic/beats/v7/metricbeat/cmd" ) func main() { diff --git a/metricbeat/main_test.go b/metricbeat/main_test.go index 5f8d0d1a6eac..1c0033a2b2d5 100644 --- a/metricbeat/main_test.go +++ b/metricbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/metricbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/metricbeat/cmd" ) var systemTest *bool diff --git a/metricbeat/mb/builders.go b/metricbeat/mb/builders.go index 04b32f5638aa..48683e05e8ab 100644 --- a/metricbeat/mb/builders.go +++ b/metricbeat/mb/builders.go @@ -25,9 +25,9 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/metricbeat/mb/event.go b/metricbeat/mb/event.go index f502299ce8d2..f92615462fa1 100644 --- a/metricbeat/mb/event.go +++ b/metricbeat/mb/event.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // EventModifier is a function that can modifies an Event. This is typically diff --git a/metricbeat/mb/event_test.go b/metricbeat/mb/event_test.go index 1040102de8c2..3de07034fca6 100644 --- a/metricbeat/mb/event_test.go +++ b/metricbeat/mb/event_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventConversionToBeatEvent(t *testing.T) { diff --git a/metricbeat/mb/example_metricset_test.go b/metricbeat/mb/example_metricset_test.go index 35267d3c7d63..af7a2dfcb6a4 100644 --- a/metricbeat/mb/example_metricset_test.go +++ b/metricbeat/mb/example_metricset_test.go @@ -20,9 +20,9 @@ package mb_test import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var hostParser = parse.URLHostParserBuilder{ diff --git a/metricbeat/mb/example_module_test.go b/metricbeat/mb/example_module_test.go index 5c3ca2ff0f59..b4520f719714 100644 --- a/metricbeat/mb/example_module_test.go +++ b/metricbeat/mb/example_module_test.go @@ -18,7 +18,7 @@ package mb_test import ( - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/mb/lightmetricset.go b/metricbeat/mb/lightmetricset.go index 11e49cd5c772..2354187b4eaf 100644 --- a/metricbeat/mb/lightmetricset.go +++ b/metricbeat/mb/lightmetricset.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // LightMetricSet contains the definition of a non-registered metric set diff --git a/metricbeat/mb/lightmetricset_test.go b/metricbeat/mb/lightmetricset_test.go index ecb3f374d481..ebdf9e1bf759 100644 --- a/metricbeat/mb/lightmetricset_test.go +++ b/metricbeat/mb/lightmetricset_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestLightMetricSetRegistration(t *testing.T) { diff --git a/metricbeat/mb/lightmodules.go b/metricbeat/mb/lightmodules.go index 0f0fb9f23cfa..bffbfbe026e4 100644 --- a/metricbeat/mb/lightmodules.go +++ b/metricbeat/mb/lightmodules.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) const ( diff --git a/metricbeat/mb/lightmodules_test.go b/metricbeat/mb/lightmodules_test.go index 287b7bfc6714..07a4ceeb54f9 100644 --- a/metricbeat/mb/lightmodules_test.go +++ b/metricbeat/mb/lightmodules_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - _ "github.com/elastic/beats/libbeat/processors/add_id" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + _ "github.com/elastic/beats/v7/libbeat/processors/add_id" ) // TestLightModulesAsModuleSource checks that registry correctly lists diff --git a/metricbeat/mb/mb.go b/metricbeat/mb/mb.go index 24475e0e01a6..b22b09debed9 100644 --- a/metricbeat/mb/mb.go +++ b/metricbeat/mb/mb.go @@ -27,10 +27,10 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" ) const ( diff --git a/metricbeat/mb/mb_test.go b/metricbeat/mb/mb_test.go index f93721d8a81e..3b734ae9208a 100644 --- a/metricbeat/mb/mb_test.go +++ b/metricbeat/mb/mb_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/module/configuration.go b/metricbeat/mb/module/configuration.go index 2ccd0bd99aca..8b0701c0ae9f 100644 --- a/metricbeat/mb/module/configuration.go +++ b/metricbeat/mb/module/configuration.go @@ -20,9 +20,9 @@ package module import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ConfiguredModules returns a list of all configured modules, including anyone present under dynamic config settings. diff --git a/metricbeat/mb/module/connector.go b/metricbeat/mb/module/connector.go index 15456c160a8e..5d9c75a573c9 100644 --- a/metricbeat/mb/module/connector.go +++ b/metricbeat/mb/module/connector.go @@ -20,11 +20,11 @@ package module import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" ) // Connector configures and establishes a beat.Client for publishing events diff --git a/metricbeat/mb/module/connector_test.go b/metricbeat/mb/module/connector_test.go index 9ca3e48cd17e..3695d1c61bea 100644 --- a/metricbeat/mb/module/connector_test.go +++ b/metricbeat/mb/module/connector_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) func TestProcessorsForConfig(t *testing.T) { diff --git a/metricbeat/mb/module/doc.go b/metricbeat/mb/module/doc.go index 1b6b13b13ba6..c67256697371 100644 --- a/metricbeat/mb/module/doc.go +++ b/metricbeat/mb/module/doc.go @@ -18,7 +18,7 @@ // Package module contains the low-level utilities for running Metricbeat // modules and metricsets. This is useful for building your own tool that // has a module and sub-module concept. If you want to reuse the whole -// Metricbeat framework see the github.com/elastic/beats/metricbeat/beater +// Metricbeat framework see the github.com/elastic/beats/v7/metricbeat/beater // package that provides a higher level interface. // // This contains the tools for instantiating modules, running them, and diff --git a/metricbeat/mb/module/example_test.go b/metricbeat/mb/module/example_test.go index e5fc7e81e830..eee9dda60b8b 100644 --- a/metricbeat/mb/module/example_test.go +++ b/metricbeat/mb/module/example_test.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) // ExampleWrapper demonstrates how to create a single Wrapper diff --git a/metricbeat/mb/module/factory.go b/metricbeat/mb/module/factory.go index 08aafb36875f..5392701ccb0f 100644 --- a/metricbeat/mb/module/factory.go +++ b/metricbeat/mb/module/factory.go @@ -18,10 +18,10 @@ package module import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Factory creates new Runner instances from configuration objects. diff --git a/metricbeat/mb/module/options.go b/metricbeat/mb/module/options.go index 2d25e363b3cd..273db92b7189 100644 --- a/metricbeat/mb/module/options.go +++ b/metricbeat/mb/module/options.go @@ -20,8 +20,8 @@ package module import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Option specifies some optional arguments used for configuring the behavior diff --git a/metricbeat/mb/module/options_test.go b/metricbeat/mb/module/options_test.go index 795fd4961895..5cc0f17be98e 100644 --- a/metricbeat/mb/module/options_test.go +++ b/metricbeat/mb/module/options_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestWithMaxStartDelay(t *testing.T) { diff --git a/metricbeat/mb/module/publish.go b/metricbeat/mb/module/publish.go index 40ce01549fe4..6f9c200eac6c 100644 --- a/metricbeat/mb/module/publish.go +++ b/metricbeat/mb/module/publish.go @@ -20,7 +20,7 @@ package module import ( "sync" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) // PublishChannels publishes the events read from each channel to the given diff --git a/metricbeat/mb/module/runner.go b/metricbeat/mb/module/runner.go index c60a009caea3..0e4bd78c9978 100644 --- a/metricbeat/mb/module/runner.go +++ b/metricbeat/mb/module/runner.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/metricbeat/mb/module/runner_group_test.go b/metricbeat/mb/module/runner_group_test.go index cbf2f310a87f..dd7babee0d79 100644 --- a/metricbeat/mb/module/runner_group_test.go +++ b/metricbeat/mb/module/runner_group_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) const ( diff --git a/metricbeat/mb/module/runner_test.go b/metricbeat/mb/module/runner_test.go index 140e6333400d..6b8b2d705ef2 100644 --- a/metricbeat/mb/module/runner_test.go +++ b/metricbeat/mb/module/runner_test.go @@ -22,11 +22,11 @@ package module_test import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - pubtest "github.com/elastic/beats/libbeat/publisher/testing" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/module/testing.go b/metricbeat/mb/module/testing.go index c7ac928ea76c..12a5891b7552 100644 --- a/metricbeat/mb/module/testing.go +++ b/metricbeat/mb/module/testing.go @@ -22,9 +22,9 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/testing" ) // receiveOneEvent receives one event from the events channel then closes the diff --git a/metricbeat/mb/module/wrapper.go b/metricbeat/mb/module/wrapper.go index dfb547dcd27d..f8375b4adf67 100644 --- a/metricbeat/mb/module/wrapper.go +++ b/metricbeat/mb/module/wrapper.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/testing" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Expvar metric names. diff --git a/metricbeat/mb/module/wrapper_test.go b/metricbeat/mb/module/wrapper_test.go index b83db1ff6bf8..1108b5bd737b 100644 --- a/metricbeat/mb/module/wrapper_test.go +++ b/metricbeat/mb/module/wrapper_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) const ( diff --git a/metricbeat/mb/parse/hostparsers.go b/metricbeat/mb/parse/hostparsers.go index 5e193e1b103e..e499de9a1d86 100644 --- a/metricbeat/mb/parse/hostparsers.go +++ b/metricbeat/mb/parse/hostparsers.go @@ -20,7 +20,7 @@ package parse import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // PassThruHostParser is a HostParser that sets the HostData URI, SanitizedURI, diff --git a/metricbeat/mb/parse/url.go b/metricbeat/mb/parse/url.go index cf9a7511bceb..0bcbfa2cac02 100644 --- a/metricbeat/mb/parse/url.go +++ b/metricbeat/mb/parse/url.go @@ -24,8 +24,8 @@ import ( p "path" "strings" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" ) diff --git a/metricbeat/mb/parse/url_test.go b/metricbeat/mb/parse/url_test.go index d7ff295b3757..997385b443f5 100644 --- a/metricbeat/mb/parse/url_test.go +++ b/metricbeat/mb/parse/url_test.go @@ -20,10 +20,10 @@ package parse import ( "testing" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/registry.go b/metricbeat/mb/registry.go index c7b13b3a60bc..780213d2392a 100644 --- a/metricbeat/mb/registry.go +++ b/metricbeat/mb/registry.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) const initialSize = 20 // initialSize specifies the initial size of the Register. diff --git a/metricbeat/mb/testing/data/data_test.go b/metricbeat/mb/testing/data/data_test.go index 3102780e66fa..775f539b59a6 100644 --- a/metricbeat/mb/testing/data/data_test.go +++ b/metricbeat/mb/testing/data/data_test.go @@ -24,9 +24,8 @@ import ( "strings" "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - - _ "github.com/elastic/beats/metricbeat/include" + _ "github.com/elastic/beats/v7/metricbeat/include" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestAll(t *testing.T) { diff --git a/metricbeat/mb/testing/data_generator.go b/metricbeat/mb/testing/data_generator.go index d890364cf870..10ab9b76e34c 100644 --- a/metricbeat/mb/testing/data_generator.go +++ b/metricbeat/mb/testing/data_generator.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" ) // WriteEvent fetches a single event writes the output to a ./_meta/data.json diff --git a/metricbeat/mb/testing/fetcher.go b/metricbeat/mb/testing/fetcher.go index 5b01e1b81382..e80101c0918e 100644 --- a/metricbeat/mb/testing/fetcher.go +++ b/metricbeat/mb/testing/fetcher.go @@ -20,9 +20,9 @@ package testing import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Fetcher is an interface implemented by all fetchers for testing purpouses diff --git a/metricbeat/mb/testing/modules.go b/metricbeat/mb/testing/modules.go index 3edd1baeef9b..673deef850d7 100644 --- a/metricbeat/mb/testing/modules.go +++ b/metricbeat/mb/testing/modules.go @@ -28,7 +28,7 @@ that Metricbeat does it and with the same validations. package mymetricset_test import ( - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { @@ -59,8 +59,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type TestModule struct { diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go index c400be0a3045..39ff777beefd 100644 --- a/metricbeat/mb/testing/testdata.go +++ b/metricbeat/mb/testing/testdata.go @@ -32,13 +32,13 @@ import ( "github.com/mitchellh/hashstructure" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" - _ "github.com/elastic/beats/metricbeat/include/fields" + _ "github.com/elastic/beats/v7/metricbeat/include/fields" ) const ( diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go index 2a325a2a214c..4e03f23d432b 100644 --- a/metricbeat/module/aerospike/fields.go +++ b/metricbeat/module/aerospike/fields.go @@ -20,7 +20,7 @@ package aerospike import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/aerospike/namespace/data.go b/metricbeat/module/aerospike/namespace/data.go index 9a0b3bd3b38f..e774d2e9ec94 100644 --- a/metricbeat/module/aerospike/namespace/data.go +++ b/metricbeat/module/aerospike/namespace/data.go @@ -18,8 +18,8 @@ package namespace import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var schema = s.Schema{ diff --git a/metricbeat/module/aerospike/namespace/namespace.go b/metricbeat/module/aerospike/namespace/namespace.go index 61b80a405306..2ac8a632626b 100644 --- a/metricbeat/module/aerospike/namespace/namespace.go +++ b/metricbeat/module/aerospike/namespace/namespace.go @@ -23,9 +23,9 @@ import ( as "github.com/aerospike/aerospike-client-go" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/aerospike" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/aerospike" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/aerospike/namespace/namespace_integration_test.go b/metricbeat/module/aerospike/namespace/namespace_integration_test.go index 1e0d1cdcd06c..547a49986a60 100644 --- a/metricbeat/module/aerospike/namespace/namespace_integration_test.go +++ b/metricbeat/module/aerospike/namespace/namespace_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/apache/fields.go b/metricbeat/module/apache/fields.go index 4dcc41db0513..619e56f1a831 100644 --- a/metricbeat/module/apache/fields.go +++ b/metricbeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/apache/status/data.go b/metricbeat/module/apache/status/data.go index 7659d161d2e3..0c57bc34357c 100644 --- a/metricbeat/module/apache/status/data.go +++ b/metricbeat/module/apache/status/data.go @@ -22,9 +22,9 @@ import ( "regexp" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/apache/status/status.go b/metricbeat/module/apache/status/status.go index ddd132841deb..92053f2373db 100644 --- a/metricbeat/module/apache/status/status.go +++ b/metricbeat/module/apache/status/status.go @@ -21,10 +21,10 @@ package status import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/apache/status/status_integration_test.go b/metricbeat/module/apache/status/status_integration_test.go index ffb563135085..96ab5439b98f 100644 --- a/metricbeat/module/apache/status/status_integration_test.go +++ b/metricbeat/module/apache/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/apache/status/status_test.go b/metricbeat/module/apache/status/status_test.go index e0eba14252a2..182b41e1af3c 100644 --- a/metricbeat/module/apache/status/status_test.go +++ b/metricbeat/module/apache/status/status_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/apache" + _ "github.com/elastic/beats/v7/metricbeat/module/apache" ) // response is a raw response copied from an Apache web server. diff --git a/metricbeat/module/beat/beat.go b/metricbeat/module/beat/beat.go index 941885e6e921..42927977b0f5 100644 --- a/metricbeat/module/beat/beat.go +++ b/metricbeat/module/beat/beat.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/beat/beat_integration_test.go b/metricbeat/module/beat/beat_integration_test.go index ba13a54cf622..d96bba4be0f2 100644 --- a/metricbeat/module/beat/beat_integration_test.go +++ b/metricbeat/module/beat/beat_integration_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/beat" - _ "github.com/elastic/beats/metricbeat/module/beat/state" - _ "github.com/elastic/beats/metricbeat/module/beat/stats" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/beat" + _ "github.com/elastic/beats/v7/metricbeat/module/beat/state" + _ "github.com/elastic/beats/v7/metricbeat/module/beat/stats" ) var metricSets = []string{ diff --git a/metricbeat/module/beat/fields.go b/metricbeat/module/beat/fields.go index 53102ecb26ce..33bbffd7dc09 100644 --- a/metricbeat/module/beat/fields.go +++ b/metricbeat/module/beat/fields.go @@ -20,7 +20,7 @@ package beat import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/beat/metricset.go b/metricbeat/module/beat/metricset.go index ba4957b47c68..fe0d2d9acf8e 100644 --- a/metricbeat/module/beat/metricset.go +++ b/metricbeat/module/beat/metricset.go @@ -18,8 +18,8 @@ package beat import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet can be used to build other metricsets within the Beat module. diff --git a/metricbeat/module/beat/state/data.go b/metricbeat/module/beat/state/data.go index 15a258389590..97a714cd9e09 100644 --- a/metricbeat/module/beat/state/data.go +++ b/metricbeat/module/beat/state/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/state/data_test.go b/metricbeat/module/beat/state/data_test.go index 468e986f91a0..606853c02065 100644 --- a/metricbeat/module/beat/state/data_test.go +++ b/metricbeat/module/beat/state/data_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/module/beat" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/state/data_xpack.go b/metricbeat/module/beat/state/data_xpack.go index e92bdd924d97..2dc2bebff880 100644 --- a/metricbeat/module/beat/state/data_xpack.go +++ b/metricbeat/module/beat/state/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - b "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + b "github.com/elastic/beats/v7/metricbeat/module/beat" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, info b.Info, content []byte) error { diff --git a/metricbeat/module/beat/state/state.go b/metricbeat/module/beat/state/state.go index 218686abce39..eb6a41ff8bfb 100644 --- a/metricbeat/module/beat/state/state.go +++ b/metricbeat/module/beat/state/state.go @@ -18,9 +18,9 @@ package state import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) func init() { diff --git a/metricbeat/module/beat/stats/data.go b/metricbeat/module/beat/stats/data.go index 8c868e1d5b29..acc595745cd6 100644 --- a/metricbeat/module/beat/stats/data.go +++ b/metricbeat/module/beat/stats/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/stats/data_test.go b/metricbeat/module/beat/stats/data_test.go index 78a87e2d4ae2..2a2feb408a45 100644 --- a/metricbeat/module/beat/stats/data_test.go +++ b/metricbeat/module/beat/stats/data_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/module/beat" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/stats/data_xpack.go b/metricbeat/module/beat/stats/data_xpack.go index 8b0da8a84e65..d0b81dbe29db 100644 --- a/metricbeat/module/beat/stats/data_xpack.go +++ b/metricbeat/module/beat/stats/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, info beat.Info, content []byte) error { diff --git a/metricbeat/module/beat/stats/stats.go b/metricbeat/module/beat/stats/stats.go index fcab548c5a37..6cee03e426ad 100644 --- a/metricbeat/module/beat/stats/stats.go +++ b/metricbeat/module/beat/stats/stats.go @@ -18,9 +18,9 @@ package stats import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) func init() { diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk.go b/metricbeat/module/ceph/cluster_disk/cluster_disk.go index 37f68f37a6cb..8f33d0e847b1 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk.go @@ -18,9 +18,9 @@ package cluster_disk import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go b/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go index b91147bfecc3..9c467a459bb3 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go @@ -22,8 +22,8 @@ package cluster_disk import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go b/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go index b073f4be6b67..b6aa3b97bded 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_disk/data.go b/metricbeat/module/ceph/cluster_disk/data.go index 259d712f8c9e..b75daa31b0e6 100644 --- a/metricbeat/module/ceph/cluster_disk/data.go +++ b/metricbeat/module/ceph/cluster_disk/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type StatsCluster struct { diff --git a/metricbeat/module/ceph/cluster_health/cluster_health.go b/metricbeat/module/ceph/cluster_health/cluster_health.go index e651a7332d79..887cb9a5de27 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health.go @@ -20,9 +20,9 @@ package cluster_health import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go b/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go index ff7c7d8e68cd..3a4e3799425e 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go @@ -22,8 +22,8 @@ package cluster_health import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_health/cluster_health_test.go b/metricbeat/module/ceph/cluster_health/cluster_health_test.go index 9f1d15fb2a54..e5514e94682a 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_health/data.go b/metricbeat/module/ceph/cluster_health/data.go index cb827e0975fe..bd94c44be2e4 100644 --- a/metricbeat/module/ceph/cluster_health/data.go +++ b/metricbeat/module/ceph/cluster_health/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Timecheck contains part of the response from a HealthRequest diff --git a/metricbeat/module/ceph/cluster_status/cluster_status.go b/metricbeat/module/ceph/cluster_status/cluster_status.go index b7a9eaa469b9..69c11a084f32 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status.go @@ -20,9 +20,9 @@ package cluster_status import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go b/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go index 1741918bf668..fee52f71fe1a 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go @@ -22,8 +22,8 @@ package cluster_status import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_status/cluster_status_test.go b/metricbeat/module/ceph/cluster_status/cluster_status_test.go index c9066e707225..3f6cd3ed7bd3 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_status/data.go b/metricbeat/module/ceph/cluster_status/data.go index 064026355fec..c19a75b44d39 100644 --- a/metricbeat/module/ceph/cluster_status/data.go +++ b/metricbeat/module/ceph/cluster_status/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PgState represents placement group state diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go index c0b558982fc4..f401f7849767 100644 --- a/metricbeat/module/ceph/fields.go +++ b/metricbeat/module/ceph/fields.go @@ -20,7 +20,7 @@ package ceph import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/ceph/mgr/metricset.go b/metricbeat/module/ceph/mgr/metricset.go index a982cf706b2c..a8e84100dcc1 100644 --- a/metricbeat/module/ceph/mgr/metricset.go +++ b/metricbeat/module/ceph/mgr/metricset.go @@ -20,8 +20,8 @@ package mgr import ( "fmt" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) type MetricSet struct { diff --git a/metricbeat/module/ceph/mgr_cluster_disk/data.go b/metricbeat/module/ceph/mgr_cluster_disk/data.go index cbb69d054162..8940f5030ed2 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/data.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/data.go @@ -20,8 +20,8 @@ package mgr_cluster_disk import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type DfResponse struct { diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go index 0cb42828faf7..14342f13621a 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go @@ -18,10 +18,10 @@ package mgr_cluster_disk import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go index 47f0fa15e4df..bb7f21f4d708 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go index b227f4c3f021..d658fa6b7048 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go @@ -20,8 +20,8 @@ package mgr_cluster_disk import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_cluster_health/data.go b/metricbeat/module/ceph/mgr_cluster_health/data.go index 8dae532bc562..b81fad378ca1 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/data.go +++ b/metricbeat/module/ceph/mgr_cluster_health/data.go @@ -20,8 +20,8 @@ package mgr_cluster_health import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type StatusResponse struct { diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go index b8dc57d2931c..fa2c1f387e53 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go @@ -20,10 +20,10 @@ package mgr_cluster_health import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go index 9113992a86be..3ab6a31574bf 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go index 255d96cfd7fd..3aa12fe454c8 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) type clientRequest struct { diff --git a/metricbeat/module/ceph/mgr_osd_perf/data.go b/metricbeat/module/ceph/mgr_osd_perf/data.go index 18b78ac6114b..562515e7b7cd 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/data.go +++ b/metricbeat/module/ceph/mgr_osd_perf/data.go @@ -20,8 +20,8 @@ package mgr_osd_perf import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type OsdPerfResponse struct { diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go index bd8fc20efd75..239afd61ed37 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go @@ -18,9 +18,9 @@ package mgr_osd_perf import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go index c592f764ed35..a187bfefe9fa 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go index 9cd253b9d07b..500d812c4689 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go @@ -20,8 +20,8 @@ package mgr_osd_perf import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/data.go b/metricbeat/module/ceph/mgr_osd_pool_stats/data.go index 4a86c6b9327e..a4990384ef74 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/data.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/data.go @@ -20,8 +20,8 @@ package mgr_osd_pool_stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type OsdPoolStat struct { diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go index 8d864a623e1e..1ce58e3a06d9 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go @@ -18,9 +18,9 @@ package mgr_osd_pool_stats import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go index af2d8898fc22..3dcfb120442a 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go index 9e3e27729112..8b84f192f59f 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go @@ -20,8 +20,8 @@ package mgr_osd_pool_stats import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_osd_tree/data.go b/metricbeat/module/ceph/mgr_osd_tree/data.go index 8694c21f90a3..3f3d1934c2ee 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/data.go +++ b/metricbeat/module/ceph/mgr_osd_tree/data.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type OsdTreeResponse struct { diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go index 49b197f2682f..aded13c1a7ab 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go @@ -18,10 +18,10 @@ package mgr_osd_tree import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go index cedc692e0791..3ecab4bdb456 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go index d59ac2803e0b..7547285046ce 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go @@ -20,8 +20,8 @@ package mgr_osd_tree import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_pool_disk/data.go b/metricbeat/module/ceph/mgr_pool_disk/data.go index 437c164fec90..5d586a0a134a 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/data.go +++ b/metricbeat/module/ceph/mgr_pool_disk/data.go @@ -20,8 +20,8 @@ package mgr_pool_disk import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) type DfResponse struct { diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go index 41b025abf24d..a3b510de9154 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go @@ -18,10 +18,10 @@ package mgr_pool_disk import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go index f3b7748263dd..e1e625521b84 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go index ab0c3f03d690..43dc8f7cbaa9 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go @@ -20,8 +20,8 @@ package mgr_pool_disk import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/monitor_health/data.go b/metricbeat/module/ceph/monitor_health/data.go index 7ca509ea212e..a40612e339df 100644 --- a/metricbeat/module/ceph/monitor_health/data.go +++ b/metricbeat/module/ceph/monitor_health/data.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Tick struct { diff --git a/metricbeat/module/ceph/monitor_health/monitor_health.go b/metricbeat/module/ceph/monitor_health/monitor_health.go index 16f7b4373243..f726969da9ee 100644 --- a/metricbeat/module/ceph/monitor_health/monitor_health.go +++ b/metricbeat/module/ceph/monitor_health/monitor_health.go @@ -18,9 +18,9 @@ package monitor_health import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/monitor_health/monitor_health_test.go b/metricbeat/module/ceph/monitor_health/monitor_health_test.go index 6790e258f077..e6a464b2543d 100644 --- a/metricbeat/module/ceph/monitor_health/monitor_health_test.go +++ b/metricbeat/module/ceph/monitor_health/monitor_health_test.go @@ -24,12 +24,12 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/ceph" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_df/data.go b/metricbeat/module/ceph/osd_df/data.go index fa0422afa519..9b48e4f89f31 100644 --- a/metricbeat/module/ceph/osd_df/data.go +++ b/metricbeat/module/ceph/osd_df/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Node represents a node object diff --git a/metricbeat/module/ceph/osd_df/osd_df.go b/metricbeat/module/ceph/osd_df/osd_df.go index 79139ed89fa1..333f259b9d96 100644 --- a/metricbeat/module/ceph/osd_df/osd_df.go +++ b/metricbeat/module/ceph/osd_df/osd_df.go @@ -20,9 +20,9 @@ package osd_df import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/osd_df/osd_df_integration_test.go b/metricbeat/module/ceph/osd_df/osd_df_integration_test.go index 8d6ba84664fa..6735749bd70d 100644 --- a/metricbeat/module/ceph/osd_df/osd_df_integration_test.go +++ b/metricbeat/module/ceph/osd_df/osd_df_integration_test.go @@ -22,8 +22,8 @@ package osd_df import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_df/osd_df_test.go b/metricbeat/module/ceph/osd_df/osd_df_test.go index cc9683956970..bef039597dd5 100644 --- a/metricbeat/module/ceph/osd_df/osd_df_test.go +++ b/metricbeat/module/ceph/osd_df/osd_df_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/osd_tree/data.go b/metricbeat/module/ceph/osd_tree/data.go index 5f7d32056f0a..f88426fa2787 100644 --- a/metricbeat/module/ceph/osd_tree/data.go +++ b/metricbeat/module/ceph/osd_tree/data.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Node represents a node object diff --git a/metricbeat/module/ceph/osd_tree/osd_tree.go b/metricbeat/module/ceph/osd_tree/osd_tree.go index 85192cff2920..6417ca59d9b0 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree.go @@ -20,9 +20,9 @@ package osd_tree import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go b/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go index 27bd36120a1f..69d7e3ed7e3d 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go @@ -22,8 +22,8 @@ package osd_tree import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_tree/osd_tree_test.go b/metricbeat/module/ceph/osd_tree/osd_tree_test.go index a92f40a8135e..872da2d32c91 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree_test.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/pool_disk/data.go b/metricbeat/module/ceph/pool_disk/data.go index d2bef377dc11..e3758c94816c 100644 --- a/metricbeat/module/ceph/pool_disk/data.go +++ b/metricbeat/module/ceph/pool_disk/data.go @@ -20,8 +20,8 @@ package pool_disk import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Stats represents the statistics for a pool diff --git a/metricbeat/module/ceph/pool_disk/pool_disk.go b/metricbeat/module/ceph/pool_disk/pool_disk.go index dfcbf79c97a3..4fda029bff46 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk.go @@ -20,9 +20,9 @@ package pool_disk import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go b/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go index cc1f68cdd81b..002acbf0c6a6 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go @@ -22,8 +22,8 @@ package pool_disk import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/pool_disk/pool_disk_test.go b/metricbeat/module/ceph/pool_disk/pool_disk_test.go index f2367401f8f7..4f153dd9d5a5 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk_test.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/consul/agent/agent.go b/metricbeat/module/consul/agent/agent.go index c1fa03ae127f..2eedcfb5506a 100644 --- a/metricbeat/module/consul/agent/agent.go +++ b/metricbeat/module/consul/agent/agent.go @@ -20,10 +20,10 @@ package agent import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var ( diff --git a/metricbeat/module/consul/agent/agent_integration_test.go b/metricbeat/module/consul/agent/agent_integration_test.go index 43c4358df903..e4e4a585e300 100644 --- a/metricbeat/module/consul/agent/agent_integration_test.go +++ b/metricbeat/module/consul/agent/agent_integration_test.go @@ -22,15 +22,15 @@ package agent import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/module/consul" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/module/consul" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/consul/agent/agent_test.go b/metricbeat/module/consul/agent/agent_test.go index 523c2449b0ff..8e47bd0b9cd6 100644 --- a/metricbeat/module/consul/agent/agent_test.go +++ b/metricbeat/module/consul/agent/agent_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var jsonExample = `{ diff --git a/metricbeat/module/consul/agent/data.go b/metricbeat/module/consul/agent/data.go index 022e066b861f..a8e45a06bab5 100644 --- a/metricbeat/module/consul/agent/data.go +++ b/metricbeat/module/consul/agent/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type valueConverter interface { diff --git a/metricbeat/module/consul/agent/data_integration_test.go b/metricbeat/module/consul/agent/data_integration_test.go index 5dfc8a32514c..b93677235c7b 100644 --- a/metricbeat/module/consul/agent/data_integration_test.go +++ b/metricbeat/module/consul/agent/data_integration_test.go @@ -24,9 +24,9 @@ import ( _ "github.com/denisenkom/go-mssqldb" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/consul" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/consul" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/consul/fields.go b/metricbeat/module/consul/fields.go index 5bd61822219a..3e396c8a0b35 100644 --- a/metricbeat/module/consul/fields.go +++ b/metricbeat/module/consul/fields.go @@ -20,7 +20,7 @@ package consul import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/bucket/bucket.go b/metricbeat/module/couchbase/bucket/bucket.go index 3f06a9760f7d..643b1ecf41c6 100644 --- a/metricbeat/module/couchbase/bucket/bucket.go +++ b/metricbeat/module/couchbase/bucket/bucket.go @@ -20,9 +20,9 @@ package bucket import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/bucket/bucket_integration_test.go b/metricbeat/module/couchbase/bucket/bucket_integration_test.go index 9f498bb52621..4311b07f06b5 100644 --- a/metricbeat/module/couchbase/bucket/bucket_integration_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/bucket/bucket_test.go b/metricbeat/module/couchbase/bucket/bucket_test.go index 62934d6472b2..0d39b4bb5fe7 100644 --- a/metricbeat/module/couchbase/bucket/bucket_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_test.go @@ -26,8 +26,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/couchbase/bucket/data.go b/metricbeat/module/couchbase/bucket/data.go index 432bcf38cd84..2aa6ab328c8b 100644 --- a/metricbeat/module/couchbase/bucket/data.go +++ b/metricbeat/module/couchbase/bucket/data.go @@ -20,8 +20,8 @@ package bucket import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type BucketQuota struct { diff --git a/metricbeat/module/couchbase/cluster/cluster.go b/metricbeat/module/couchbase/cluster/cluster.go index 556b37669821..2d18856c090e 100644 --- a/metricbeat/module/couchbase/cluster/cluster.go +++ b/metricbeat/module/couchbase/cluster/cluster.go @@ -20,9 +20,9 @@ package cluster import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/cluster/cluster_integration_test.go b/metricbeat/module/couchbase/cluster/cluster_integration_test.go index d2eb6c8d72e5..11b136f0bb35 100644 --- a/metricbeat/module/couchbase/cluster/cluster_integration_test.go +++ b/metricbeat/module/couchbase/cluster/cluster_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/cluster/cluster_test.go b/metricbeat/module/couchbase/cluster/cluster_test.go index 0733e9fbc7f4..8a7c6f5338cf 100644 --- a/metricbeat/module/couchbase/cluster/cluster_test.go +++ b/metricbeat/module/couchbase/cluster/cluster_test.go @@ -22,9 +22,9 @@ package cluster import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchbase/cluster/data.go b/metricbeat/module/couchbase/cluster/data.go index e099c3e5a9f0..5195f6d708c4 100644 --- a/metricbeat/module/couchbase/cluster/data.go +++ b/metricbeat/module/couchbase/cluster/data.go @@ -20,8 +20,8 @@ package cluster import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type StorageTotals_Ram struct { diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go index 8cc55dafee70..5168ad706776 100644 --- a/metricbeat/module/couchbase/fields.go +++ b/metricbeat/module/couchbase/fields.go @@ -20,7 +20,7 @@ package couchbase import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/node/data.go b/metricbeat/module/couchbase/node/data.go index 046226bce5fb..b4a2d107e3fa 100644 --- a/metricbeat/module/couchbase/node/data.go +++ b/metricbeat/module/couchbase/node/data.go @@ -22,8 +22,8 @@ import ( "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type NodeSystemStats struct { diff --git a/metricbeat/module/couchbase/node/node.go b/metricbeat/module/couchbase/node/node.go index 5ad637aa8b49..cbb1ba7ce068 100644 --- a/metricbeat/module/couchbase/node/node.go +++ b/metricbeat/module/couchbase/node/node.go @@ -20,9 +20,9 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/node/node_integration_test.go b/metricbeat/module/couchbase/node/node_integration_test.go index 2ed90e6c86fa..63c47e1c565d 100644 --- a/metricbeat/module/couchbase/node/node_integration_test.go +++ b/metricbeat/module/couchbase/node/node_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/node/node_test.go b/metricbeat/module/couchbase/node/node_test.go index 4245bd3589c3..b99a2c0b76fd 100644 --- a/metricbeat/module/couchbase/node/node_test.go +++ b/metricbeat/module/couchbase/node/node_test.go @@ -22,9 +22,9 @@ package node import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchdb/fields.go b/metricbeat/module/couchdb/fields.go index 0b4759ade514..fb4182e2dbd5 100644 --- a/metricbeat/module/couchdb/fields.go +++ b/metricbeat/module/couchdb/fields.go @@ -20,7 +20,7 @@ package couchdb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchdb/server/data.go b/metricbeat/module/couchdb/server/data.go index 0d971f40a1d7..9b6c3c25cd73 100644 --- a/metricbeat/module/couchdb/server/data.go +++ b/metricbeat/module/couchdb/server/data.go @@ -20,8 +20,8 @@ package server import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Server type defines all fields of the Server Metricset diff --git a/metricbeat/module/couchdb/server/server.go b/metricbeat/module/couchdb/server/server.go index e32d827f4d27..7207fbf08eab 100644 --- a/metricbeat/module/couchdb/server/server.go +++ b/metricbeat/module/couchdb/server/server.go @@ -20,9 +20,9 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchdb/server/server_integration_test.go b/metricbeat/module/couchdb/server/server_integration_test.go index 08f443d78027..22c7a841a34d 100644 --- a/metricbeat/module/couchdb/server/server_integration_test.go +++ b/metricbeat/module/couchdb/server/server_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchdb/server/server_test.go b/metricbeat/module/couchdb/server/server_test.go index dd13ee45bed8..d76b2f2c9041 100644 --- a/metricbeat/module/couchdb/server/server_test.go +++ b/metricbeat/module/couchdb/server/server_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/docker/container/container.go b/metricbeat/module/docker/container/container.go index b3523464db3e..04c4f123b799 100644 --- a/metricbeat/module/docker/container/container.go +++ b/metricbeat/module/docker/container/container.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/container/container_integration_test.go b/metricbeat/module/docker/container/container_integration_test.go index 146d31d25f86..47b9dff36f63 100644 --- a/metricbeat/module/docker/container/container_integration_test.go +++ b/metricbeat/module/docker/container/container_integration_test.go @@ -22,7 +22,7 @@ package container import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/container/data.go b/metricbeat/module/docker/container/data.go index d693f988e296..abda8657e7da 100644 --- a/metricbeat/module/docker/container/data.go +++ b/metricbeat/module/docker/container/data.go @@ -22,9 +22,9 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, containersList []types.Container, dedot bool) { diff --git a/metricbeat/module/docker/cpu/cpu.go b/metricbeat/module/docker/cpu/cpu.go index a07b4f8466f0..0f13fab22484 100644 --- a/metricbeat/module/docker/cpu/cpu.go +++ b/metricbeat/module/docker/cpu/cpu.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/cpu/cpu_integration_test.go b/metricbeat/module/docker/cpu/cpu_integration_test.go index d781791849e7..7ef25eb1a4b4 100644 --- a/metricbeat/module/docker/cpu/cpu_integration_test.go +++ b/metricbeat/module/docker/cpu/cpu_integration_test.go @@ -22,7 +22,7 @@ package cpu import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/cpu/cpu_test.go b/metricbeat/module/docker/cpu/cpu_test.go index bcce353343d0..d14fda678d9b 100644 --- a/metricbeat/module/docker/cpu/cpu_test.go +++ b/metricbeat/module/docker/cpu/cpu_test.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) var cpuService CPUService diff --git a/metricbeat/module/docker/cpu/data.go b/metricbeat/module/docker/cpu/data.go index 3614d55e4ca0..d69d3aa78288 100644 --- a/metricbeat/module/docker/cpu/data.go +++ b/metricbeat/module/docker/cpu/data.go @@ -18,8 +18,8 @@ package cpu import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, cpuStatsList []CPUStats) { diff --git a/metricbeat/module/docker/cpu/helper.go b/metricbeat/module/docker/cpu/helper.go index 02d045f30b74..75527285f1ee 100644 --- a/metricbeat/module/docker/cpu/helper.go +++ b/metricbeat/module/docker/cpu/helper.go @@ -20,9 +20,9 @@ package cpu import ( "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type CPUStats struct { diff --git a/metricbeat/module/docker/diskio/data.go b/metricbeat/module/docker/diskio/data.go index 2a7d4cb9569a..85b975ffeae2 100644 --- a/metricbeat/module/docker/diskio/data.go +++ b/metricbeat/module/docker/diskio/data.go @@ -18,8 +18,8 @@ package diskio import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, blkioStatsList []BlkioStats) { diff --git a/metricbeat/module/docker/diskio/diskio.go b/metricbeat/module/docker/diskio/diskio.go index dacf86374c30..8868d1607f7b 100644 --- a/metricbeat/module/docker/diskio/diskio.go +++ b/metricbeat/module/docker/diskio/diskio.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/diskio/diskio_integration_test.go b/metricbeat/module/docker/diskio/diskio_integration_test.go index 875815ff1828..0c5cd6a27c6a 100644 --- a/metricbeat/module/docker/diskio/diskio_integration_test.go +++ b/metricbeat/module/docker/diskio/diskio_integration_test.go @@ -22,7 +22,7 @@ package diskio import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/diskio/diskio_test.go b/metricbeat/module/docker/diskio/diskio_test.go index a10db61221cd..520ec7bd2658 100644 --- a/metricbeat/module/docker/diskio/diskio_test.go +++ b/metricbeat/module/docker/diskio/diskio_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) var blkioService BlkioService diff --git a/metricbeat/module/docker/diskio/helper.go b/metricbeat/module/docker/diskio/helper.go index 17895944e28e..6f984f1860df 100644 --- a/metricbeat/module/docker/diskio/helper.go +++ b/metricbeat/module/docker/diskio/helper.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type BlkioStats struct { diff --git a/metricbeat/module/docker/docker.go b/metricbeat/module/docker/docker.go index 2957dabefcd4..b4a7b91a1cf3 100644 --- a/metricbeat/module/docker/docker.go +++ b/metricbeat/module/docker/docker.go @@ -30,9 +30,9 @@ import ( "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // Select Docker API version diff --git a/metricbeat/module/docker/event/event.go b/metricbeat/module/docker/event/event.go index c8ab896de6bb..ad9421cb8f06 100644 --- a/metricbeat/module/docker/event/event.go +++ b/metricbeat/module/docker/event/event.go @@ -28,10 +28,10 @@ import ( "github.com/docker/docker/api/types/events" "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/docker/event/event_integration_test.go b/metricbeat/module/docker/event/event_integration_test.go index 51666efe579c..5d4b7ce79893 100644 --- a/metricbeat/module/docker/event/event_integration_test.go +++ b/metricbeat/module/docker/event/event_integration_test.go @@ -30,10 +30,10 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go index d2fd8a42eaae..31e6287f9a81 100644 --- a/metricbeat/module/docker/fields.go +++ b/metricbeat/module/docker/fields.go @@ -20,7 +20,7 @@ package docker import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/docker/healthcheck/data.go b/metricbeat/module/docker/healthcheck/data.go index 5f0c8dbc9cc0..6ced97223289 100644 --- a/metricbeat/module/docker/healthcheck/data.go +++ b/metricbeat/module/docker/healthcheck/data.go @@ -24,9 +24,9 @@ import ( "github.com/docker/docker/api/types" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func eventsMapping(r mb.ReporterV2, containers []types.Container, m *MetricSet) { diff --git a/metricbeat/module/docker/healthcheck/healthcheck.go b/metricbeat/module/docker/healthcheck/healthcheck.go index 1b90ccd5471a..1033af8d692f 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck.go +++ b/metricbeat/module/docker/healthcheck/healthcheck.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go b/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go index 600fcb926a60..2f0012ef5e48 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go +++ b/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go @@ -22,7 +22,7 @@ package healthcheck import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/helper.go b/metricbeat/module/docker/helper.go index 6813ef2a4317..fd2343d6f259 100644 --- a/metricbeat/module/docker/helper.go +++ b/metricbeat/module/docker/helper.go @@ -20,8 +20,8 @@ package docker import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - helpers "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + helpers "github.com/elastic/beats/v7/libbeat/common/docker" ) // Container is a struct representation of a container diff --git a/metricbeat/module/docker/helper_test.go b/metricbeat/module/docker/helper_test.go index c9fc5a18f70a..556c75e54f70 100644 --- a/metricbeat/module/docker/helper_test.go +++ b/metricbeat/module/docker/helper_test.go @@ -20,11 +20,11 @@ package docker import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" - helpers "github.com/elastic/beats/libbeat/common/docker" + helpers "github.com/elastic/beats/v7/libbeat/common/docker" ) func TestDeDotLabels(t *testing.T) { diff --git a/metricbeat/module/docker/image/data.go b/metricbeat/module/docker/image/data.go index bf2fa4e96ba6..e809450f241f 100644 --- a/metricbeat/module/docker/image/data.go +++ b/metricbeat/module/docker/image/data.go @@ -22,8 +22,8 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" ) func eventsMapping(imagesList []types.ImageSummary, dedot bool) []common.MapStr { diff --git a/metricbeat/module/docker/image/image.go b/metricbeat/module/docker/image/image.go index 7dead12f42f8..62ea612f83c0 100644 --- a/metricbeat/module/docker/image/image.go +++ b/metricbeat/module/docker/image/image.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/docker/image/image_integration_test.go b/metricbeat/module/docker/image/image_integration_test.go index 591656810848..1dd56b6d177c 100644 --- a/metricbeat/module/docker/image/image_integration_test.go +++ b/metricbeat/module/docker/image/image_integration_test.go @@ -22,7 +22,7 @@ package image import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/info/data.go b/metricbeat/module/docker/info/data.go index 65d2738db6bc..6b3f2e628cf8 100644 --- a/metricbeat/module/docker/info/data.go +++ b/metricbeat/module/docker/info/data.go @@ -20,7 +20,7 @@ package info import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(info *types.Info) common.MapStr { diff --git a/metricbeat/module/docker/info/info.go b/metricbeat/module/docker/info/info.go index 43a8da63bada..fed6fedd966a 100644 --- a/metricbeat/module/docker/info/info.go +++ b/metricbeat/module/docker/info/info.go @@ -22,9 +22,9 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/info/info_integration_test.go b/metricbeat/module/docker/info/info_integration_test.go index 46059043d8a7..82687f11355d 100644 --- a/metricbeat/module/docker/info/info_integration_test.go +++ b/metricbeat/module/docker/info/info_integration_test.go @@ -22,7 +22,7 @@ package info import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/memory/data.go b/metricbeat/module/docker/memory/data.go index 25737be8b351..0a418e48c5ba 100644 --- a/metricbeat/module/docker/memory/data.go +++ b/metricbeat/module/docker/memory/data.go @@ -18,8 +18,8 @@ package memory import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, memoryDataList []MemoryData) { diff --git a/metricbeat/module/docker/memory/helper.go b/metricbeat/module/docker/memory/helper.go index 7c3b86845e0c..459c26cccebc 100644 --- a/metricbeat/module/docker/memory/helper.go +++ b/metricbeat/module/docker/memory/helper.go @@ -18,8 +18,8 @@ package memory import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) // MemoryData contains parsed container memory info diff --git a/metricbeat/module/docker/memory/memory.go b/metricbeat/module/docker/memory/memory.go index 8108b30d46ce..3a56adba57a7 100644 --- a/metricbeat/module/docker/memory/memory.go +++ b/metricbeat/module/docker/memory/memory.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/memory/memory_integration_test.go b/metricbeat/module/docker/memory/memory_integration_test.go index d751841c6b94..6d21e07eb728 100644 --- a/metricbeat/module/docker/memory/memory_integration_test.go +++ b/metricbeat/module/docker/memory/memory_integration_test.go @@ -22,7 +22,7 @@ package memory import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/memory/memory_test.go b/metricbeat/module/docker/memory/memory_test.go index 05f742417a77..695e6770de12 100644 --- a/metricbeat/module/docker/memory/memory_test.go +++ b/metricbeat/module/docker/memory/memory_test.go @@ -25,9 +25,9 @@ import ( "github.com/docker/docker/api/types" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func TestMemoryService_GetMemoryStats(t *testing.T) { diff --git a/metricbeat/module/docker/network/data.go b/metricbeat/module/docker/network/data.go index 94567f08f390..b4a2b90c4056 100644 --- a/metricbeat/module/docker/network/data.go +++ b/metricbeat/module/docker/network/data.go @@ -18,8 +18,8 @@ package network import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, netsStatsList []NetStats) { diff --git a/metricbeat/module/docker/network/helper.go b/metricbeat/module/docker/network/helper.go index 794574bace1b..0f980fc2ab94 100644 --- a/metricbeat/module/docker/network/helper.go +++ b/metricbeat/module/docker/network/helper.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type NetService struct { diff --git a/metricbeat/module/docker/network/network.go b/metricbeat/module/docker/network/network.go index 84cdd4d1c59b..04e67c954129 100644 --- a/metricbeat/module/docker/network/network.go +++ b/metricbeat/module/docker/network/network.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/network/network_integration_test.go b/metricbeat/module/docker/network/network_integration_test.go index 015bf40a5faa..418d057e247a 100644 --- a/metricbeat/module/docker/network/network_integration_test.go +++ b/metricbeat/module/docker/network/network_integration_test.go @@ -22,7 +22,7 @@ package network import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/collector.go b/metricbeat/module/dropwizard/collector/collector.go index dd1f922baf99..eb1f6439abaf 100644 --- a/metricbeat/module/dropwizard/collector/collector.go +++ b/metricbeat/module/dropwizard/collector/collector.go @@ -21,9 +21,9 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/dropwizard/collector/collector_integration_test.go b/metricbeat/module/dropwizard/collector/collector_integration_test.go index fc09de69354d..470cabd18e83 100644 --- a/metricbeat/module/dropwizard/collector/collector_integration_test.go +++ b/metricbeat/module/dropwizard/collector/collector_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/collector_test.go b/metricbeat/module/dropwizard/collector/collector_test.go index ff0e7a41e0d2..181b6e0812e0 100644 --- a/metricbeat/module/dropwizard/collector/collector_test.go +++ b/metricbeat/module/dropwizard/collector/collector_test.go @@ -22,9 +22,9 @@ package collector import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/dropwizard" + _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/data.go b/metricbeat/module/dropwizard/collector/data.go index d191a35e4cff..59c8ad5a275b 100644 --- a/metricbeat/module/dropwizard/collector/data.go +++ b/metricbeat/module/dropwizard/collector/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type DropWizardEvent struct { diff --git a/metricbeat/module/dropwizard/collector/data_test.go b/metricbeat/module/dropwizard/collector/data_test.go index 959edd1df5ab..823b81b3131b 100644 --- a/metricbeat/module/dropwizard/collector/data_test.go +++ b/metricbeat/module/dropwizard/collector/data_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestSplitTagsFromMetricName(t *testing.T) { diff --git a/metricbeat/module/dropwizard/fields.go b/metricbeat/module/dropwizard/fields.go index 81235e54d5fe..3143c53ee41d 100644 --- a/metricbeat/module/dropwizard/fields.go +++ b/metricbeat/module/dropwizard/fields.go @@ -20,7 +20,7 @@ package dropwizard import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/ccr/ccr.go b/metricbeat/module/elasticsearch/ccr/ccr.go index d67d3b01f3d4..20d5cc657796 100644 --- a/metricbeat/module/elasticsearch/ccr/ccr.go +++ b/metricbeat/module/elasticsearch/ccr/ccr.go @@ -20,13 +20,13 @@ package ccr import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/ccr/data.go b/metricbeat/module/elasticsearch/ccr/data.go index 748e42ca7033..8d7d11bffa39 100644 --- a/metricbeat/module/elasticsearch/ccr/data.go +++ b/metricbeat/module/elasticsearch/ccr/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/ccr/data_test.go b/metricbeat/module/elasticsearch/ccr/data_test.go index 45f7c89464fa..c75bcdda5044 100644 --- a/metricbeat/module/elasticsearch/ccr/data_test.go +++ b/metricbeat/module/elasticsearch/ccr/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/ccr/data_xpack.go b/metricbeat/module/elasticsearch/ccr/data_xpack.go index 990f5a4043f3..547397f18a0c 100644 --- a/metricbeat/module/elasticsearch/ccr/data_xpack.go +++ b/metricbeat/module/elasticsearch/ccr/data_xpack.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go index d50def84528d..425ef0abacfc 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go +++ b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go @@ -20,8 +20,8 @@ package cluster_stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/cluster_stats/data.go b/metricbeat/module/elasticsearch/cluster_stats/data.go index 23c3cef1508d..281eb1410063 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/cluster_stats/data_test.go b/metricbeat/module/elasticsearch/cluster_stats/data_test.go index 6a4c35ebad06..0078712d787e 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data_test.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data_test.go @@ -22,7 +22,7 @@ package cluster_stats import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go b/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go index 0dacb45d56fb..37ec8018b0af 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func clusterNeedsTLSEnabled(license *elasticsearch.License, stackStats common.MapStr) (bool, error) { diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index ca797c18402e..9698f6ce0037 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" ) func init() { diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index af75edb41ff4..ec302d68da88 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -32,21 +32,21 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/helper/elastic" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/shard" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ccr" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/cluster_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/enrich" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_recovery" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_summary" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ml_job" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node_stats" + _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/shard" ) var metricSets = []string{ diff --git a/metricbeat/module/elasticsearch/enrich/data.go b/metricbeat/module/elasticsearch/enrich/data.go index cc4fb5a24eaf..722ff41d6c38 100644 --- a/metricbeat/module/elasticsearch/enrich/data.go +++ b/metricbeat/module/elasticsearch/enrich/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/enrich/data_test.go b/metricbeat/module/elasticsearch/enrich/data_test.go index 3d3f5f6017a3..3e7fcbb97341 100644 --- a/metricbeat/module/elasticsearch/enrich/data_test.go +++ b/metricbeat/module/elasticsearch/enrich/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/enrich/data_xpack.go b/metricbeat/module/elasticsearch/enrich/data_xpack.go index 6b3029f43612..39309fd79fca 100644 --- a/metricbeat/module/elasticsearch/enrich/data_xpack.go +++ b/metricbeat/module/elasticsearch/enrich/data_xpack.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/enrich/enrich.go b/metricbeat/module/elasticsearch/enrich/enrich.go index d2acf780b9ad..6b60394a23e8 100644 --- a/metricbeat/module/elasticsearch/enrich/enrich.go +++ b/metricbeat/module/elasticsearch/enrich/enrich.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index c107604bfb34..b08f0c8122cb 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/index/data.go b/metricbeat/module/elasticsearch/index/data.go index 0d5bc4688dfb..d16d8ae21900 100644 --- a/metricbeat/module/elasticsearch/index/data.go +++ b/metricbeat/module/elasticsearch/index/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) type IndicesStruct struct { diff --git a/metricbeat/module/elasticsearch/index/data_test.go b/metricbeat/module/elasticsearch/index/data_test.go index 5040c7dac4f5..b0dd46cf96e1 100644 --- a/metricbeat/module/elasticsearch/index/data_test.go +++ b/metricbeat/module/elasticsearch/index/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/index/data_xpack.go b/metricbeat/module/elasticsearch/index/data_xpack.go index 2860d509d0b1..e70bf6adb764 100644 --- a/metricbeat/module/elasticsearch/index/data_xpack.go +++ b/metricbeat/module/elasticsearch/index/data_xpack.go @@ -26,12 +26,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go index cdf7ddd02d82..6936b836b160 100644 --- a/metricbeat/module/elasticsearch/index/index.go +++ b/metricbeat/module/elasticsearch/index/index.go @@ -20,8 +20,8 @@ package index import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/index_recovery/data.go b/metricbeat/module/elasticsearch/index_recovery/data.go index b71a4cecf46f..1aaa731bba1e 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data.go +++ b/metricbeat/module/elasticsearch/index_recovery/data.go @@ -23,12 +23,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index c06e01ca23be..19194e3161d3 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -22,7 +22,7 @@ package index_recovery import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go b/metricbeat/module/elasticsearch/index_recovery/data_xpack.go index bbef1654a84c..e8bbc3dcad5d 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_xpack.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go index 86ed23adc00b..68d1ee295d34 100644 --- a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go +++ b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go @@ -20,8 +20,8 @@ package index_recovery import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/index_summary/data.go b/metricbeat/module/elasticsearch/index_summary/data.go index 8335f2cf018b..fe75162bf737 100644 --- a/metricbeat/module/elasticsearch/index_summary/data.go +++ b/metricbeat/module/elasticsearch/index_summary/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_summary/data_test.go b/metricbeat/module/elasticsearch/index_summary/data_test.go index 57bd8a43b28a..e96c72bce309 100644 --- a/metricbeat/module/elasticsearch/index_summary/data_test.go +++ b/metricbeat/module/elasticsearch/index_summary/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/index_summary/data_xpack.go b/metricbeat/module/elasticsearch/index_summary/data_xpack.go index 8cf8a5a7b06c..d1e00ea64b86 100644 --- a/metricbeat/module/elasticsearch/index_summary/data_xpack.go +++ b/metricbeat/module/elasticsearch/index_summary/data_xpack.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go index 527e796ca5d2..569e23492cb3 100644 --- a/metricbeat/module/elasticsearch/index_summary/index_summary.go +++ b/metricbeat/module/elasticsearch/index_summary/index_summary.go @@ -20,9 +20,9 @@ package index_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index 7477337adf76..c1daae4f577c 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -18,9 +18,9 @@ package elasticsearch import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/elasticsearch/ml_job/data.go b/metricbeat/module/elasticsearch/ml_job/data.go index 9f8fe74a1c87..b914a4bd5647 100644 --- a/metricbeat/module/elasticsearch/ml_job/data.go +++ b/metricbeat/module/elasticsearch/ml_job/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/ml_job/data_test.go b/metricbeat/module/elasticsearch/ml_job/data_test.go index b6081642b9f4..07198d996fcb 100644 --- a/metricbeat/module/elasticsearch/ml_job/data_test.go +++ b/metricbeat/module/elasticsearch/ml_job/data_test.go @@ -22,7 +22,7 @@ package ml_job import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/ml_job/data_xpack.go b/metricbeat/module/elasticsearch/ml_job/data_xpack.go index 79e0703dff8c..04c4cec29332 100644 --- a/metricbeat/module/elasticsearch/ml_job/data_xpack.go +++ b/metricbeat/module/elasticsearch/ml_job/data_xpack.go @@ -25,10 +25,10 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job.go b/metricbeat/module/elasticsearch/ml_job/ml_job.go index f6eac74f17e2..506b1fade852 100644 --- a/metricbeat/module/elasticsearch/ml_job/ml_job.go +++ b/metricbeat/module/elasticsearch/ml_job/ml_job.go @@ -20,8 +20,8 @@ package ml_job import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/node/data.go b/metricbeat/module/elasticsearch/node/data.go index 0670edfbcc75..56acc36752a5 100644 --- a/metricbeat/module/elasticsearch/node/data.go +++ b/metricbeat/module/elasticsearch/node/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node/data_test.go b/metricbeat/module/elasticsearch/node/data_test.go index 9921a16fe08d..2d45181d48b4 100644 --- a/metricbeat/module/elasticsearch/node/data_test.go +++ b/metricbeat/module/elasticsearch/node/data_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/node/node.go b/metricbeat/module/elasticsearch/node/node.go index 17337553ce66..29587a1dd3e8 100644 --- a/metricbeat/module/elasticsearch/node/node.go +++ b/metricbeat/module/elasticsearch/node/node.go @@ -20,9 +20,9 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/node/node_test.go b/metricbeat/module/elasticsearch/node/node_test.go index ca41c7b935fc..0b843fc04778 100644 --- a/metricbeat/module/elasticsearch/node/node_test.go +++ b/metricbeat/module/elasticsearch/node/node_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 94b6b965c2d6..4e860d0b52e6 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -21,16 +21,16 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node_stats/data_test.go b/metricbeat/module/elasticsearch/node_stats/data_test.go index 670b67cf2891..043a1447f253 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_test.go +++ b/metricbeat/module/elasticsearch/node_stats/data_test.go @@ -22,7 +22,7 @@ package node_stats import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index 4f0b34269eb3..f7f612b11eef 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -25,12 +25,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index 53dc8a6fd0c4..7498948fd76a 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -18,8 +18,8 @@ package node_stats import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/pending_tasks/data.go b/metricbeat/module/elasticsearch/pending_tasks/data.go index 9a44852d7a9d..0f414750bd65 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data.go @@ -23,12 +23,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/pending_tasks/data_test.go b/metricbeat/module/elasticsearch/pending_tasks/data_test.go index 3d2cbfeefd2a..e38c202386cb 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data_test.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go index 1dabb03da99b..01f11e763185 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go +++ b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go @@ -20,8 +20,8 @@ package pending_tasks import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/shard/data.go b/metricbeat/module/elasticsearch/shard/data.go index b601aa3449fa..73486638f1b5 100644 --- a/metricbeat/module/elasticsearch/shard/data.go +++ b/metricbeat/module/elasticsearch/shard/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/shard/data_test.go b/metricbeat/module/elasticsearch/shard/data_test.go index 35b854688762..377b73617f35 100644 --- a/metricbeat/module/elasticsearch/shard/data_test.go +++ b/metricbeat/module/elasticsearch/shard/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/shard/data_xpack.go b/metricbeat/module/elasticsearch/shard/data_xpack.go index bf7b443fd599..30e0e92b4dc7 100644 --- a/metricbeat/module/elasticsearch/shard/data_xpack.go +++ b/metricbeat/module/elasticsearch/shard/data_xpack.go @@ -25,10 +25,10 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, content []byte) error { diff --git a/metricbeat/module/elasticsearch/shard/shard.go b/metricbeat/module/elasticsearch/shard/shard.go index 43c032170c35..fa46777dffde 100644 --- a/metricbeat/module/elasticsearch/shard/shard.go +++ b/metricbeat/module/elasticsearch/shard/shard.go @@ -20,8 +20,8 @@ package shard import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/testing.go b/metricbeat/module/elasticsearch/testing.go index 4ea87c120bdd..a68685dd62d3 100644 --- a/metricbeat/module/elasticsearch/testing.go +++ b/metricbeat/module/elasticsearch/testing.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) // TestMapper tests mapping methods diff --git a/metricbeat/module/envoyproxy/fields.go b/metricbeat/module/envoyproxy/fields.go index a9bde3cc50b0..06afeacdf12e 100644 --- a/metricbeat/module/envoyproxy/fields.go +++ b/metricbeat/module/envoyproxy/fields.go @@ -20,7 +20,7 @@ package envoyproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/envoyproxy/server/data.go b/metricbeat/module/envoyproxy/server/data.go index 37db7e0405f1..850d8c53914d 100644 --- a/metricbeat/module/envoyproxy/server/data.go +++ b/metricbeat/module/envoyproxy/server/data.go @@ -21,9 +21,9 @@ import ( "regexp" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/envoyproxy/server/server.go b/metricbeat/module/envoyproxy/server/server.go index 4ae21ba062af..b37cd6dbcfd8 100644 --- a/metricbeat/module/envoyproxy/server/server.go +++ b/metricbeat/module/envoyproxy/server/server.go @@ -20,9 +20,9 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/envoyproxy/server/server_integration_test.go b/metricbeat/module/envoyproxy/server/server_integration_test.go index b7d8a235a8e6..24e331be8c01 100644 --- a/metricbeat/module/envoyproxy/server/server_integration_test.go +++ b/metricbeat/module/envoyproxy/server/server_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/envoyproxy/server/server_test.go b/metricbeat/module/envoyproxy/server/server_test.go index 4f0e3d43516d..c4f8eb775949 100644 --- a/metricbeat/module/envoyproxy/server/server_test.go +++ b/metricbeat/module/envoyproxy/server/server_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go index a5007b95794f..b2d735b99088 100644 --- a/metricbeat/module/etcd/fields.go +++ b/metricbeat/module/etcd/fields.go @@ -20,7 +20,7 @@ package etcd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/etcd/leader/data.go b/metricbeat/module/etcd/leader/data.go index e2f2f6ed2bea..15322921b37a 100644 --- a/metricbeat/module/etcd/leader/data.go +++ b/metricbeat/module/etcd/leader/data.go @@ -20,7 +20,7 @@ package leader import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Counts struct { diff --git a/metricbeat/module/etcd/leader/leader.go b/metricbeat/module/etcd/leader/leader.go index 16a635554109..940be4a0f795 100644 --- a/metricbeat/module/etcd/leader/leader.go +++ b/metricbeat/module/etcd/leader/leader.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/leader/leader_integration_test.go b/metricbeat/module/etcd/leader/leader_integration_test.go index cc6aaf29dee4..fb8814410457 100644 --- a/metricbeat/module/etcd/leader/leader_integration_test.go +++ b/metricbeat/module/etcd/leader/leader_integration_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/leader/leader_test.go b/metricbeat/module/etcd/leader/leader_test.go index 31dfa2e718ea..7fd42c3038a3 100644 --- a/metricbeat/module/etcd/leader/leader_test.go +++ b/metricbeat/module/etcd/leader/leader_test.go @@ -28,7 +28,7 @@ import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/etcd/metrics/metrics.go b/metricbeat/module/etcd/metrics/metrics.go index ce4e9591338b..e6c2c1fe96be 100644 --- a/metricbeat/module/etcd/metrics/metrics.go +++ b/metricbeat/module/etcd/metrics/metrics.go @@ -18,8 +18,8 @@ package metrics import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/etcd/metrics/metrics_integration_test.go b/metricbeat/module/etcd/metrics/metrics_integration_test.go index ff323c59b695..2faa820a7446 100644 --- a/metricbeat/module/etcd/metrics/metrics_integration_test.go +++ b/metricbeat/module/etcd/metrics/metrics_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/metrics/metrics_test.go b/metricbeat/module/etcd/metrics/metrics_test.go index 68198bdf49a2..9be6c8b95f3a 100644 --- a/metricbeat/module/etcd/metrics/metrics_test.go +++ b/metricbeat/module/etcd/metrics/metrics_test.go @@ -22,10 +22,10 @@ package metrics import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/etcd" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/etcd/self/data.go b/metricbeat/module/etcd/self/data.go index e6c655c1c2bc..fd3bfe23e05d 100644 --- a/metricbeat/module/etcd/self/data.go +++ b/metricbeat/module/etcd/self/data.go @@ -20,7 +20,7 @@ package self import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type LeaderInfo struct { diff --git a/metricbeat/module/etcd/self/self.go b/metricbeat/module/etcd/self/self.go index 39e42d32e0a6..30f649db4c8c 100644 --- a/metricbeat/module/etcd/self/self.go +++ b/metricbeat/module/etcd/self/self.go @@ -20,10 +20,10 @@ package self import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/self/self_integration_test.go b/metricbeat/module/etcd/self/self_integration_test.go index d83057859061..dfbfff22f154 100644 --- a/metricbeat/module/etcd/self/self_integration_test.go +++ b/metricbeat/module/etcd/self/self_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/self/self_test.go b/metricbeat/module/etcd/self/self_test.go index 2640107659cf..9d1b8f2d2664 100644 --- a/metricbeat/module/etcd/self/self_test.go +++ b/metricbeat/module/etcd/self/self_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "testing" ) diff --git a/metricbeat/module/etcd/store/data.go b/metricbeat/module/etcd/store/data.go index 202fcefea685..de8271d6f201 100644 --- a/metricbeat/module/etcd/store/data.go +++ b/metricbeat/module/etcd/store/data.go @@ -20,10 +20,10 @@ package store import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/etcd/store/store.go b/metricbeat/module/etcd/store/store.go index 513cf2f42882..44baaf873fde 100644 --- a/metricbeat/module/etcd/store/store.go +++ b/metricbeat/module/etcd/store/store.go @@ -20,10 +20,10 @@ package store import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/store/store_integration_test.go b/metricbeat/module/etcd/store/store_integration_test.go index 20e954031289..ad455c4eafba 100644 --- a/metricbeat/module/etcd/store/store_integration_test.go +++ b/metricbeat/module/etcd/store/store_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/store/store_test.go b/metricbeat/module/etcd/store/store_test.go index 7d0353280fc7..cb1173e3eb4c 100644 --- a/metricbeat/module/etcd/store/store_test.go +++ b/metricbeat/module/etcd/store/store_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "testing" ) diff --git a/metricbeat/module/golang/expvar/expvar.go b/metricbeat/module/golang/expvar/expvar.go index 78fdbc0ff7b4..bf026f3f50ed 100644 --- a/metricbeat/module/golang/expvar/expvar.go +++ b/metricbeat/module/golang/expvar/expvar.go @@ -20,10 +20,10 @@ package expvar import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/golang" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/golang" ) const ( diff --git a/metricbeat/module/golang/expvar/expvar_integration_test.go b/metricbeat/module/golang/expvar/expvar_integration_test.go index a16b97fab42b..2e722225cbde 100644 --- a/metricbeat/module/golang/expvar/expvar_integration_test.go +++ b/metricbeat/module/golang/expvar/expvar_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/golang/fields.go b/metricbeat/module/golang/fields.go index 5f4b47833d74..3a81eac50236 100644 --- a/metricbeat/module/golang/fields.go +++ b/metricbeat/module/golang/fields.go @@ -20,7 +20,7 @@ package golang import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/golang/heap/data.go b/metricbeat/module/golang/heap/data.go index 8e6134d4879b..ad052e4348eb 100644 --- a/metricbeat/module/golang/heap/data.go +++ b/metricbeat/module/golang/heap/data.go @@ -20,8 +20,8 @@ package heap import ( "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/golang" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/golang" ) //Stats contains the memory info that we get from the fetch request diff --git a/metricbeat/module/golang/heap/heap.go b/metricbeat/module/golang/heap/heap.go index 206f84dd56d1..e30142b6c916 100644 --- a/metricbeat/module/golang/heap/heap.go +++ b/metricbeat/module/golang/heap/heap.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var logger = logp.NewLogger("golang.heap") diff --git a/metricbeat/module/golang/heap/heap_integration_test.go b/metricbeat/module/golang/heap/heap_integration_test.go index 11fcff59ec1d..8214a11c686e 100644 --- a/metricbeat/module/golang/heap/heap_integration_test.go +++ b/metricbeat/module/golang/heap/heap_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/golang/util.go b/metricbeat/module/golang/util.go index 18a118d956bf..db04ae7e01ef 100644 --- a/metricbeat/module/golang/util.go +++ b/metricbeat/module/golang/util.go @@ -21,7 +21,7 @@ import ( "bytes" "strings" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) /** diff --git a/metricbeat/module/graphite/fields.go b/metricbeat/module/graphite/fields.go index c46a6148ef2b..a4845943868d 100644 --- a/metricbeat/module/graphite/fields.go +++ b/metricbeat/module/graphite/fields.go @@ -20,7 +20,7 @@ package graphite import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/graphite/server/data.go b/metricbeat/module/graphite/server/data.go index 6e6c164ea681..df6fb7ee515b 100644 --- a/metricbeat/module/graphite/server/data.go +++ b/metricbeat/module/graphite/server/data.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type template struct { diff --git a/metricbeat/module/graphite/server/data_test.go b/metricbeat/module/graphite/server/data_test.go index 813b7e58805d..a29dbccf426d 100644 --- a/metricbeat/module/graphite/server/data_test.go +++ b/metricbeat/module/graphite/server/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func GetMetricProcessor() *metricProcessor { diff --git a/metricbeat/module/graphite/server/server.go b/metricbeat/module/graphite/server/server.go index 43007faac45f..cf29141c6835 100644 --- a/metricbeat/module/graphite/server/server.go +++ b/metricbeat/module/graphite/server/server.go @@ -20,11 +20,11 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - serverhelper "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/helper/server/tcp" - "github.com/elastic/beats/metricbeat/helper/server/udp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/helper/server/tcp" + "github.com/elastic/beats/v7/metricbeat/helper/server/udp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/haproxy/fields.go b/metricbeat/module/haproxy/fields.go index 1bee67c59051..531515409dc0 100644 --- a/metricbeat/module/haproxy/fields.go +++ b/metricbeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/haproxy/haproxy.go b/metricbeat/module/haproxy/haproxy.go index b10fd522ee38..390c5a737e85 100644 --- a/metricbeat/module/haproxy/haproxy.go +++ b/metricbeat/module/haproxy/haproxy.go @@ -30,9 +30,9 @@ import ( "github.com/mitchellh/mapstructure" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // HostParser is used for parsing the configured HAProxy hosts. diff --git a/metricbeat/module/haproxy/haproxy_test.go b/metricbeat/module/haproxy/haproxy_test.go index 149b89ecd90f..0eb921ccd3b6 100644 --- a/metricbeat/module/haproxy/haproxy_test.go +++ b/metricbeat/module/haproxy/haproxy_test.go @@ -20,7 +20,7 @@ package haproxy import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/haproxy/info/data.go b/metricbeat/module/haproxy/info/data.go index c66c90542de4..1503945cb447 100644 --- a/metricbeat/module/haproxy/info/data.go +++ b/metricbeat/module/haproxy/info/data.go @@ -20,11 +20,11 @@ package info import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" "reflect" "strconv" diff --git a/metricbeat/module/haproxy/info/info.go b/metricbeat/module/haproxy/info/info.go index 4e873b1a6e6d..1ddb13418911 100644 --- a/metricbeat/module/haproxy/info/info.go +++ b/metricbeat/module/haproxy/info/info.go @@ -20,10 +20,10 @@ package info import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" ) const ( diff --git a/metricbeat/module/haproxy/info/info_integration_test.go b/metricbeat/module/haproxy/info/info_integration_test.go index 209f3051f7db..aaa653e9791a 100644 --- a/metricbeat/module/haproxy/info/info_integration_test.go +++ b/metricbeat/module/haproxy/info/info_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/haproxy/stat/data.go b/metricbeat/module/haproxy/stat/data.go index 7a92d9ceb34b..5911180be4fb 100644 --- a/metricbeat/module/haproxy/stat/data.go +++ b/metricbeat/module/haproxy/stat/data.go @@ -20,11 +20,11 @@ package stat import ( "reflect" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" ) var ( diff --git a/metricbeat/module/haproxy/stat/stat.go b/metricbeat/module/haproxy/stat/stat.go index 15f6b61b27a2..692cd0f6a3b2 100644 --- a/metricbeat/module/haproxy/stat/stat.go +++ b/metricbeat/module/haproxy/stat/stat.go @@ -20,9 +20,9 @@ package stat import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" ) const ( diff --git a/metricbeat/module/haproxy/stat/stat_integration_test.go b/metricbeat/module/haproxy/stat/stat_integration_test.go index f50cd7b6f6c9..8edeece69cf7 100644 --- a/metricbeat/module/haproxy/stat/stat_integration_test.go +++ b/metricbeat/module/haproxy/stat/stat_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go index 68862c3e815a..d8c94f37f071 100644 --- a/metricbeat/module/http/fields.go +++ b/metricbeat/module/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/http/json/data.go b/metricbeat/module/http/json/data.go index 235baf6cd145..feabe8657f57 100644 --- a/metricbeat/module/http/json/data.go +++ b/metricbeat/module/http/json/data.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func (m *MetricSet) processBody(response *http.Response, jsonBody interface{}) mb.Event { diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go index fdfdf500a031..7803efe2f1e9 100644 --- a/metricbeat/module/http/json/json.go +++ b/metricbeat/module/http/json/json.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/http/json/json_integration_test.go b/metricbeat/module/http/json/json_integration_test.go index 4f0645001e2d..597dca2c9b6a 100644 --- a/metricbeat/module/http/json/json_integration_test.go +++ b/metricbeat/module/http/json/json_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchObject(t *testing.T) { diff --git a/metricbeat/module/http/json/json_test.go b/metricbeat/module/http/json/json_test.go index b8f21b4ae9e7..c39503e84708 100644 --- a/metricbeat/module/http/json/json_test.go +++ b/metricbeat/module/http/json/json_test.go @@ -22,9 +22,9 @@ package json import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/http" + _ "github.com/elastic/beats/v7/metricbeat/module/http" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/http/server/config.go b/metricbeat/module/http/server/config.go index cb601fc74f0c..065001b06dfc 100644 --- a/metricbeat/module/http/server/config.go +++ b/metricbeat/module/http/server/config.go @@ -20,7 +20,7 @@ package server import ( "errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type HttpServerConfig struct { diff --git a/metricbeat/module/http/server/data.go b/metricbeat/module/http/server/data.go index b3c4d6655b65..a65c95e3cae1 100644 --- a/metricbeat/module/http/server/data.go +++ b/metricbeat/module/http/server/data.go @@ -24,9 +24,9 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type metricProcessor struct { diff --git a/metricbeat/module/http/server/data_test.go b/metricbeat/module/http/server/data_test.go index 94ab3024e132..b4ef1be5e1a9 100644 --- a/metricbeat/module/http/server/data_test.go +++ b/metricbeat/module/http/server/data_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func GetMetricProcessor() *metricProcessor { diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go index ab16bd060a97..a22857dfbcec 100644 --- a/metricbeat/module/http/server/server.go +++ b/metricbeat/module/http/server/server.go @@ -20,9 +20,9 @@ package server import ( "fmt" - serverhelper "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/helper/server/http" - "github.com/elastic/beats/metricbeat/mb" + serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/helper/server/http" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/iis/application_pool/application_pool.go b/metricbeat/module/iis/application_pool/application_pool.go index 913ac03eea1f..aa469788074c 100644 --- a/metricbeat/module/iis/application_pool/application_pool.go +++ b/metricbeat/module/iis/application_pool/application_pool.go @@ -22,9 +22,9 @@ package application_pool import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/iis/application_pool/application_pool_test.go b/metricbeat/module/iis/application_pool/application_pool_test.go index f118d135c1f2..bbc94b23416a 100644 --- a/metricbeat/module/iis/application_pool/application_pool_test.go +++ b/metricbeat/module/iis/application_pool/application_pool_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestMetricsetNoErrors(t *testing.T) { diff --git a/metricbeat/module/iis/application_pool/reader.go b/metricbeat/module/iis/application_pool/reader.go index 11651d5e510b..d471e7b74561 100644 --- a/metricbeat/module/iis/application_pool/reader.go +++ b/metricbeat/module/iis/application_pool/reader.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Reader strucr will contain the pdh query and config options diff --git a/metricbeat/module/iis/application_pool/reader_test.go b/metricbeat/module/iis/application_pool/reader_test.go index 3fddd416dd98..f112e4431dc2 100644 --- a/metricbeat/module/iis/application_pool/reader_test.go +++ b/metricbeat/module/iis/application_pool/reader_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" ) // TestNewReaderValid should successfully instantiate the reader. diff --git a/metricbeat/module/iis/fields.go b/metricbeat/module/iis/fields.go index 20cec62b75e3..eeed74947c20 100644 --- a/metricbeat/module/iis/fields.go +++ b/metricbeat/module/iis/fields.go @@ -20,7 +20,7 @@ package iis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/iis/webserver/webserver_integration_test.go b/metricbeat/module/iis/webserver/webserver_integration_test.go index 643b883bd835..5e775beb0b5b 100644 --- a/metricbeat/module/iis/webserver/webserver_integration_test.go +++ b/metricbeat/module/iis/webserver/webserver_integration_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/windows" - _ "github.com/elastic/beats/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v7/metricbeat/module/windows" + _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/iis/webserver/webserver_test.go b/metricbeat/module/iis/webserver/webserver_test.go index 4d639aadbe55..fa82f1ff181e 100644 --- a/metricbeat/module/iis/webserver/webserver_test.go +++ b/metricbeat/module/iis/webserver/webserver_test.go @@ -22,7 +22,7 @@ package webserver import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/iis/website/website_integration_test.go b/metricbeat/module/iis/website/website_integration_test.go index 3b8bea6a5f37..7372dab47c00 100644 --- a/metricbeat/module/iis/website/website_integration_test.go +++ b/metricbeat/module/iis/website/website_integration_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/windows" - _ "github.com/elastic/beats/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v7/metricbeat/module/windows" + _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/iis/website/website_test.go b/metricbeat/module/iis/website/website_test.go index f9618fa3bfbb..10d5d27cce6d 100644 --- a/metricbeat/module/iis/website/website_test.go +++ b/metricbeat/module/iis/website/website_test.go @@ -22,7 +22,7 @@ package website import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/jolokia/fields.go b/metricbeat/module/jolokia/fields.go index 62f2b0fd69ba..241a0320e411 100644 --- a/metricbeat/module/jolokia/fields.go +++ b/metricbeat/module/jolokia/fields.go @@ -20,7 +20,7 @@ package jolokia import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/jolokia/jmx/config.go b/metricbeat/module/jolokia/jmx/config.go index 60b9a60ff631..4925ee6a2937 100644 --- a/metricbeat/module/jolokia/jmx/config.go +++ b/metricbeat/module/jolokia/jmx/config.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type JMXMapping struct { diff --git a/metricbeat/module/jolokia/jmx/data.go b/metricbeat/module/jolokia/jmx/data.go index 2ce2c73a8627..b7e0913fec95 100644 --- a/metricbeat/module/jolokia/jmx/data.go +++ b/metricbeat/module/jolokia/jmx/data.go @@ -23,8 +23,8 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/jolokia/jmx/data_test.go b/metricbeat/module/jolokia/jmx/data_test.go index 2fa8dd1429e9..b9b3c9d5275a 100644 --- a/metricbeat/module/jolokia/jmx/data_test.go +++ b/metricbeat/module/jolokia/jmx/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventMapper(t *testing.T) { diff --git a/metricbeat/module/jolokia/jmx/jmx.go b/metricbeat/module/jolokia/jmx/jmx.go index 187be18128a1..909a0db21665 100644 --- a/metricbeat/module/jolokia/jmx/jmx.go +++ b/metricbeat/module/jolokia/jmx/jmx.go @@ -18,12 +18,12 @@ package jmx import ( - "github.com/elastic/beats/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var ( diff --git a/metricbeat/module/jolokia/jmx/jmx_integration_test.go b/metricbeat/module/jolokia/jmx/jmx_integration_test.go index 3fe9c31f3d75..407ecd9f9700 100644 --- a/metricbeat/module/jolokia/jmx/jmx_integration_test.go +++ b/metricbeat/module/jolokia/jmx/jmx_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kafka/broker.go b/metricbeat/module/kafka/broker.go index fa61b2dc0c51..b9e78c7dacc2 100644 --- a/metricbeat/module/kafka/broker.go +++ b/metricbeat/module/kafka/broker.go @@ -30,8 +30,8 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kafka" ) // Version returns a kafka version from its string representation diff --git a/metricbeat/module/kafka/broker/broker_integration_test.go b/metricbeat/module/kafka/broker/broker_integration_test.go index decbe5c50c99..ed16252d3d52 100644 --- a/metricbeat/module/kafka/broker/broker_integration_test.go +++ b/metricbeat/module/kafka/broker/broker_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/broker/broker_test.go b/metricbeat/module/kafka/broker/broker_test.go index baa751cafd06..a863a28e2e66 100644 --- a/metricbeat/module/kafka/broker/broker_test.go +++ b/metricbeat/module/kafka/broker/broker_test.go @@ -20,10 +20,10 @@ package broker import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/config.go b/metricbeat/module/kafka/config.go index f3a9ae829fb1..8d42af9982b6 100644 --- a/metricbeat/module/kafka/config.go +++ b/metricbeat/module/kafka/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) type metricsetConfig struct { diff --git a/metricbeat/module/kafka/consumer/consumer_integration_test.go b/metricbeat/module/kafka/consumer/consumer_integration_test.go index c36555426f0f..aa4dd6d4dcc6 100644 --- a/metricbeat/module/kafka/consumer/consumer_integration_test.go +++ b/metricbeat/module/kafka/consumer/consumer_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/consumer/consumer_test.go b/metricbeat/module/kafka/consumer/consumer_test.go index e3dd80155668..eafda045d0d4 100644 --- a/metricbeat/module/kafka/consumer/consumer_test.go +++ b/metricbeat/module/kafka/consumer/consumer_test.go @@ -20,10 +20,10 @@ package consumer import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go index 045276ed9d5b..25c0205a9f3b 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go index a30b5d108282..ee2ca076e231 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go @@ -27,9 +27,9 @@ import ( saramacluster "github.com/bsm/sarama-cluster" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/module/kafka/consumergroup/mock_test.go b/metricbeat/module/kafka/consumergroup/mock_test.go index 030af091bff5..e25abf46a075 100644 --- a/metricbeat/module/kafka/consumergroup/mock_test.go +++ b/metricbeat/module/kafka/consumergroup/mock_test.go @@ -23,7 +23,7 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) type mockClient struct { diff --git a/metricbeat/module/kafka/consumergroup/query.go b/metricbeat/module/kafka/consumergroup/query.go index 8b9b98e3ec0b..cb200db83b50 100644 --- a/metricbeat/module/kafka/consumergroup/query.go +++ b/metricbeat/module/kafka/consumergroup/query.go @@ -20,9 +20,9 @@ package consumergroup import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) type client interface { diff --git a/metricbeat/module/kafka/consumergroup/query_test.go b/metricbeat/module/kafka/consumergroup/query_test.go index febf616b67e7..6c913fb9428e 100644 --- a/metricbeat/module/kafka/consumergroup/query_test.go +++ b/metricbeat/module/kafka/consumergroup/query_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFetchGroupInfo(t *testing.T) { diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go index 38e2bfb076b1..7920163da93d 100644 --- a/metricbeat/module/kafka/fields.go +++ b/metricbeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kafka/kafka.go b/metricbeat/module/kafka/kafka.go index fac3108470eb..c610c126f50f 100644 --- a/metricbeat/module/kafka/kafka.go +++ b/metricbeat/module/kafka/kafka.go @@ -17,6 +17,6 @@ package kafka -import "github.com/elastic/beats/libbeat/logp" +import "github.com/elastic/beats/v7/libbeat/logp" var debugf = logp.MakeDebug("kafka") diff --git a/metricbeat/module/kafka/metricset.go b/metricbeat/module/kafka/metricset.go index 624e1aa8d348..73c1be02218c 100644 --- a/metricbeat/module/kafka/metricset.go +++ b/metricbeat/module/kafka/metricset.go @@ -20,8 +20,8 @@ package kafka import ( "crypto/tls" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet is the base metricset for all Kafka metricsets diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go index 4aa5c3a5721a..7a1e8aeebf9d 100644 --- a/metricbeat/module/kafka/partition/partition.go +++ b/metricbeat/module/kafka/partition/partition.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) // init registers the partition MetricSet with the central registry. diff --git a/metricbeat/module/kafka/partition/partition_integration_test.go b/metricbeat/module/kafka/partition/partition_integration_test.go index af5b0f72ea5b..a78634cb59be 100644 --- a/metricbeat/module/kafka/partition/partition_integration_test.go +++ b/metricbeat/module/kafka/partition/partition_integration_test.go @@ -29,10 +29,10 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/module/kafka/producer/producer_integration_test.go b/metricbeat/module/kafka/producer/producer_integration_test.go index 711b516e9f28..b66f58385438 100644 --- a/metricbeat/module/kafka/producer/producer_integration_test.go +++ b/metricbeat/module/kafka/producer/producer_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/producer/producer_test.go b/metricbeat/module/kafka/producer/producer_test.go index 2cf33e994a56..0469ea57ced9 100644 --- a/metricbeat/module/kafka/producer/producer_test.go +++ b/metricbeat/module/kafka/producer/producer_test.go @@ -20,10 +20,10 @@ package producer import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go index 5fa5228de54e..eeddf8d856a3 100644 --- a/metricbeat/module/kibana/fields.go +++ b/metricbeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kibana/kibana.go b/metricbeat/module/kibana/kibana.go index 24a49559d51f..4acb124695be 100644 --- a/metricbeat/module/kibana/kibana.go +++ b/metricbeat/module/kibana/kibana.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kibana/kibana_integration_test.go b/metricbeat/module/kibana/kibana_integration_test.go index 301a5031a301..e04986fa6981 100644 --- a/metricbeat/module/kibana/kibana_integration_test.go +++ b/metricbeat/module/kibana/kibana_integration_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana" - _ "github.com/elastic/beats/metricbeat/module/kibana/stats" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kibana" + _ "github.com/elastic/beats/v7/metricbeat/module/kibana/stats" ) var xpackMetricSets = []string{ diff --git a/metricbeat/module/kibana/kibana_test.go b/metricbeat/module/kibana/kibana_test.go index ca4e2b562617..be2158019aae 100644 --- a/metricbeat/module/kibana/kibana_test.go +++ b/metricbeat/module/kibana/kibana_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestIsStatsAPIAvailable(t *testing.T) { diff --git a/metricbeat/module/kibana/metricset.go b/metricbeat/module/kibana/metricset.go index f099bd775753..1a68669fe58e 100644 --- a/metricbeat/module/kibana/metricset.go +++ b/metricbeat/module/kibana/metricset.go @@ -18,7 +18,7 @@ package kibana import ( - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet can be used to build other metricsets within the Kibana module. diff --git a/metricbeat/module/kibana/stats/data.go b/metricbeat/module/kibana/stats/data.go index 6f776e306a0e..e560e7d5cffe 100644 --- a/metricbeat/module/kibana/stats/data.go +++ b/metricbeat/module/kibana/stats/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kibana" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kibana" ) var ( diff --git a/metricbeat/module/kibana/stats/data_test.go b/metricbeat/module/kibana/stats/data_test.go index b5101c3349a8..98c38c44d3cd 100644 --- a/metricbeat/module/kibana/stats/data_test.go +++ b/metricbeat/module/kibana/stats/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index 5dc2cf8f241e..30c3c75190ad 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/kibana/stats/data_xpack_test.go b/metricbeat/module/kibana/stats/data_xpack_test.go index db7605f8e23c..d5c36fef1f0d 100644 --- a/metricbeat/module/kibana/stats/data_xpack_test.go +++ b/metricbeat/module/kibana/stats/data_xpack_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMappingStatsXPack(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index d84c1dfcfe74..526a525951c2 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kibana" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/stats/stats_integration_test.go b/metricbeat/module/kibana/stats/stats_integration_test.go index c8c19e57e245..8bbf584000de 100644 --- a/metricbeat/module/kibana/stats/stats_integration_test.go +++ b/metricbeat/module/kibana/stats/stats_integration_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats_test.go b/metricbeat/module/kibana/stats/stats_test.go index 291f60352d2e..b6757e5ecb21 100644 --- a/metricbeat/module/kibana/stats/stats_test.go +++ b/metricbeat/module/kibana/stats/stats_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" ) func TestFetchUsage(t *testing.T) { diff --git a/metricbeat/module/kibana/status/data.go b/metricbeat/module/kibana/status/data.go index 9aa93cf72cff..93173165fb60 100644 --- a/metricbeat/module/kibana/status/data.go +++ b/metricbeat/module/kibana/status/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kibana" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kibana" ) var ( diff --git a/metricbeat/module/kibana/status/data_test.go b/metricbeat/module/kibana/status/data_test.go index 2acaf056e728..73cfcfd09106 100644 --- a/metricbeat/module/kibana/status/data_test.go +++ b/metricbeat/module/kibana/status/data_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kibana/status/status.go b/metricbeat/module/kibana/status/status.go index 3d9bae94c0c7..c386ccb00101 100644 --- a/metricbeat/module/kibana/status/status.go +++ b/metricbeat/module/kibana/status/status.go @@ -20,10 +20,10 @@ package status import ( "fmt" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kibana" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/status/status_integration_test.go b/metricbeat/module/kibana/status/status_integration_test.go index b6413ea9b9aa..003dd34f4524 100644 --- a/metricbeat/module/kibana/status/status_integration_test.go +++ b/metricbeat/module/kibana/status/status_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/status/status_test.go b/metricbeat/module/kibana/status/status_test.go index 8bfb45fa6c6e..406619a4ccb2 100644 --- a/metricbeat/module/kibana/status/status_test.go +++ b/metricbeat/module/kibana/status/status_test.go @@ -22,9 +22,9 @@ package status import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kibana" + _ "github.com/elastic/beats/v7/metricbeat/module/kibana" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver.go b/metricbeat/module/kubernetes/apiserver/apiserver.go index c14accf31236..c49f80c8b768 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver.go @@ -18,8 +18,8 @@ package apiserver import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver_test.go b/metricbeat/module/kubernetes/apiserver/apiserver_test.go index 01ab59603ead..42d8b2231434 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver_test.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver_test.go @@ -22,9 +22,9 @@ package apiserver import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/apiserver/metricset.go b/metricbeat/module/kubernetes/apiserver/metricset.go index 81a4c5e43c07..75cf428157c7 100644 --- a/metricbeat/module/kubernetes/apiserver/metricset.go +++ b/metricbeat/module/kubernetes/apiserver/metricset.go @@ -20,8 +20,8 @@ package apiserver import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Metricset for apiserver is a prometheus based metricset diff --git a/metricbeat/module/kubernetes/container/container.go b/metricbeat/module/kubernetes/container/container.go index acbf437163dd..718696a0a4f9 100644 --- a/metricbeat/module/kubernetes/container/container.go +++ b/metricbeat/module/kubernetes/container/container.go @@ -20,11 +20,11 @@ package container import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/container/container_test.go b/metricbeat/module/kubernetes/container/container_test.go index 5d622b3ffed2..42f1fe710f30 100644 --- a/metricbeat/module/kubernetes/container/container_test.go +++ b/metricbeat/module/kubernetes/container/container_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/container/data.go b/metricbeat/module/kubernetes/container/data.go index 93e6f9bc620c..53a795624d98 100644 --- a/metricbeat/module/kubernetes/container/data.go +++ b/metricbeat/module/kubernetes/container/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager.go b/metricbeat/module/kubernetes/controllermanager/controllermanager.go index db90b4dee712..dee40ebfcff4 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager.go @@ -18,8 +18,8 @@ package controllermanager import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go index c121a557d6ab..daa65789b756 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go @@ -22,7 +22,7 @@ package controllermanager import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go index 81f6b237697a..89be60274524 100644 --- a/metricbeat/module/kubernetes/event/event.go +++ b/metricbeat/module/kubernetes/event/event.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kubernetes/event/event_test.go b/metricbeat/module/kubernetes/event/event_test.go index 2086a2d03ef5..6b441f13b065 100644 --- a/metricbeat/module/kubernetes/event/event_test.go +++ b/metricbeat/module/kubernetes/event/event_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestGenerateMapStrFromEvent(t *testing.T) { diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index c2f2f6e6b62b..a145885d27f9 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -20,7 +20,7 @@ package kubernetes import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kubernetes/node/data.go b/metricbeat/module/kubernetes/node/data.go index 0d055880ee6d..9c2ab8eaec5a 100644 --- a/metricbeat/module/kubernetes/node/data.go +++ b/metricbeat/module/kubernetes/node/data.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) (common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/node/node.go b/metricbeat/module/kubernetes/node/node.go index 804600ecb690..9868f3ec2cde 100644 --- a/metricbeat/module/kubernetes/node/node.go +++ b/metricbeat/module/kubernetes/node/node.go @@ -20,13 +20,13 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/node/node_test.go b/metricbeat/module/kubernetes/node/node_test.go index 2a27f186fae6..e240c31d174f 100644 --- a/metricbeat/module/kubernetes/node/node_test.go +++ b/metricbeat/module/kubernetes/node/node_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/pod/data.go b/metricbeat/module/kubernetes/pod/data.go index ccfa3a8ef518..ff53f4dbb1dd 100644 --- a/metricbeat/module/kubernetes/pod/data.go +++ b/metricbeat/module/kubernetes/pod/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/pod/pod.go b/metricbeat/module/kubernetes/pod/pod.go index 8762f6ad1dd7..4c47cb6863c8 100644 --- a/metricbeat/module/kubernetes/pod/pod.go +++ b/metricbeat/module/kubernetes/pod/pod.go @@ -20,12 +20,12 @@ package pod import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/pod/pod_test.go b/metricbeat/module/kubernetes/pod/pod_test.go index 6b0a5069c590..d6333b0776e6 100644 --- a/metricbeat/module/kubernetes/pod/pod_test.go +++ b/metricbeat/module/kubernetes/pod/pod_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/proxy/proxy.go b/metricbeat/module/kubernetes/proxy/proxy.go index c675f7a7110e..520a708f31d6 100644 --- a/metricbeat/module/kubernetes/proxy/proxy.go +++ b/metricbeat/module/kubernetes/proxy/proxy.go @@ -18,8 +18,8 @@ package proxy import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/proxy/proxy_test.go b/metricbeat/module/kubernetes/proxy/proxy_test.go index 99838d8562d3..79a940dced0c 100644 --- a/metricbeat/module/kubernetes/proxy/proxy_test.go +++ b/metricbeat/module/kubernetes/proxy/proxy_test.go @@ -22,7 +22,7 @@ package proxy import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/scheduler/scheduler.go b/metricbeat/module/kubernetes/scheduler/scheduler.go index 123b0f7eef1b..201e4fdb6d5a 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler.go @@ -18,8 +18,8 @@ package scheduler import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/scheduler/scheduler_test.go b/metricbeat/module/kubernetes/scheduler/scheduler_test.go index e3dbbf5d6769..301319d9d5ae 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler_test.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler_test.go @@ -22,7 +22,7 @@ package scheduler import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/state_container/state_container.go b/metricbeat/module/kubernetes/state_container/state_container.go index e2771ac9cd6e..647fcff8b4fe 100644 --- a/metricbeat/module/kubernetes/state_container/state_container.go +++ b/metricbeat/module/kubernetes/state_container/state_container.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_container/state_container_test.go b/metricbeat/module/kubernetes/state_container/state_container_test.go index a74fc8836e9d..d3bbe08f92b6 100644 --- a/metricbeat/module/kubernetes/state_container/state_container_test.go +++ b/metricbeat/module/kubernetes/state_container/state_container_test.go @@ -22,10 +22,10 @@ package state_container import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go index 58d61d5ccccf..a0fc4f120c8f 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go @@ -20,9 +20,9 @@ package state_cronjob import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go index a767226c2799..c04acbce0d01 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go @@ -22,7 +22,7 @@ package state_cronjob import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment.go b/metricbeat/module/kubernetes/state_deployment/state_deployment.go index 3ce8b7d382a6..ded9115d1cec 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment.go @@ -18,12 +18,12 @@ package state_deployment import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go index 98781161d20b..8d70c8ac3b18 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go @@ -22,9 +22,9 @@ package state_deployment import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_node/state_node.go b/metricbeat/module/kubernetes/state_node/state_node.go index 8835f3f09cd6..bd3349152402 100644 --- a/metricbeat/module/kubernetes/state_node/state_node.go +++ b/metricbeat/module/kubernetes/state_node/state_node.go @@ -20,11 +20,11 @@ package state_node import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_node/state_node_test.go b/metricbeat/module/kubernetes/state_node/state_node_test.go index 780617d13a0d..9cb46fa715b7 100644 --- a/metricbeat/module/kubernetes/state_node/state_node_test.go +++ b/metricbeat/module/kubernetes/state_node/state_node_test.go @@ -22,10 +22,10 @@ package state_node import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go index 7c55729374de..6505e1e0be63 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go @@ -18,8 +18,8 @@ package state_persistentvolume import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go index f3f700a64c19..fc7f93507af6 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go @@ -22,7 +22,7 @@ package state_persistentvolume import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go index 25b2c7616571..b7685089a83e 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go @@ -18,8 +18,8 @@ package state_persistentvolumeclaim import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go index 210cd91826bd..71e3c282ddc0 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go @@ -22,7 +22,7 @@ package state_persistentvolumeclaim import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_pod/state_pod.go b/metricbeat/module/kubernetes/state_pod/state_pod.go index 543fa946e2a3..7a531e0a5e80 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod.go @@ -18,12 +18,12 @@ package state_pod import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_pod/state_pod_test.go b/metricbeat/module/kubernetes/state_pod/state_pod_test.go index 2848865d59ae..068c5fdc9a7b 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod_test.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod_test.go @@ -22,10 +22,10 @@ package state_pod import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go index fe387e7a53bd..cc24af630bd7 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go @@ -18,12 +18,12 @@ package state_replicaset import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go index f8311dcf932b..ea32d7257745 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go @@ -22,10 +22,10 @@ package state_replicaset import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go index 0cd31adf8ac1..8901714bf330 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go @@ -18,8 +18,8 @@ package state_resourcequota import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go index 4f8f9a197a43..b32130eaa5d1 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go @@ -22,7 +22,7 @@ package state_resourcequota import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_service/state_service.go b/metricbeat/module/kubernetes/state_service/state_service.go index 9de1bc270af8..4cadbb5aa747 100644 --- a/metricbeat/module/kubernetes/state_service/state_service.go +++ b/metricbeat/module/kubernetes/state_service/state_service.go @@ -18,8 +18,8 @@ package state_service import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_service/state_service_test.go b/metricbeat/module/kubernetes/state_service/state_service_test.go index 8b2e9e42e7f6..cae6735c6e5c 100644 --- a/metricbeat/module/kubernetes/state_service/state_service_test.go +++ b/metricbeat/module/kubernetes/state_service/state_service_test.go @@ -22,7 +22,7 @@ package state_service import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go index 172069103a80..cadaf4a72383 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go @@ -18,12 +18,12 @@ package state_statefulset import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go index a618a8bdea14..119e4d16e4bb 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go @@ -22,11 +22,11 @@ package state_statefulset import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go index 356485d49a1d..98db701cfeb1 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go @@ -18,8 +18,8 @@ package state_storageclass import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go index 524121ce6faa..c8552663dda6 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go @@ -22,7 +22,7 @@ package state_storageclass import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/system/data.go b/metricbeat/module/kubernetes/system/data.go index 6cf09f85335b..7e839211bfc7 100644 --- a/metricbeat/module/kubernetes/system/data.go +++ b/metricbeat/module/kubernetes/system/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/system/system.go b/metricbeat/module/kubernetes/system/system.go index fd9495b392e0..b10c9c4afb3b 100644 --- a/metricbeat/module/kubernetes/system/system.go +++ b/metricbeat/module/kubernetes/system/system.go @@ -20,10 +20,10 @@ package system import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/kubernetes/system/system_test.go b/metricbeat/module/kubernetes/system/system_test.go index 23db40d9973c..657c4c1903b8 100644 --- a/metricbeat/module/kubernetes/system/system_test.go +++ b/metricbeat/module/kubernetes/system/system_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index df88096f810a..7f8317daa351 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/resource" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Enricher takes Kubernetes events and enrich them with k8s metadata diff --git a/metricbeat/module/kubernetes/util/kubernetes_test.go b/metricbeat/module/kubernetes/util/kubernetes_test.go index 210baa3801cf..bab34ef6cd30 100644 --- a/metricbeat/module/kubernetes/util/kubernetes_test.go +++ b/metricbeat/module/kubernetes/util/kubernetes_test.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestBuildMetadataEnricher(t *testing.T) { diff --git a/metricbeat/module/kubernetes/util/metrics_cache.go b/metricbeat/module/kubernetes/util/metrics_cache.go index 7ffff06edfea..3fdf59d8b16f 100644 --- a/metricbeat/module/kubernetes/util/metrics_cache.go +++ b/metricbeat/module/kubernetes/util/metrics_cache.go @@ -20,7 +20,7 @@ package util import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PerfMetrics stores known metrics from Kubernetes nodes and containers diff --git a/metricbeat/module/kubernetes/volume/data.go b/metricbeat/module/kubernetes/volume/data.go index 756d998a98d4..ae0f5d891f49 100644 --- a/metricbeat/module/kubernetes/volume/data.go +++ b/metricbeat/module/kubernetes/volume/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/volume/volume.go b/metricbeat/module/kubernetes/volume/volume.go index b4a9589ca9aa..102d8edfabca 100644 --- a/metricbeat/module/kubernetes/volume/volume.go +++ b/metricbeat/module/kubernetes/volume/volume.go @@ -20,10 +20,10 @@ package volume import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/kubernetes/volume/volume_test.go b/metricbeat/module/kubernetes/volume/volume_test.go index fea2d75e83b4..e527a64d452c 100644 --- a/metricbeat/module/kubernetes/volume/volume_test.go +++ b/metricbeat/module/kubernetes/volume/volume_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kvm/dommemstat/dommemstat.go b/metricbeat/module/kvm/dommemstat/dommemstat.go index b198719e8477..8beb22d433c7 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat.go @@ -22,15 +22,15 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/pkg/errors" "github.com/digitalocean/go-libvirt" "github.com/digitalocean/go-libvirt/libvirttest" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/metricbeat/module/kvm/dommemstat/dommemstat_test.go b/metricbeat/module/kvm/dommemstat/dommemstat_test.go index 3aa4c0ff6377..087b941dbfa5 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat_test.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/digitalocean/go-libvirt/libvirttest" ) diff --git a/metricbeat/module/kvm/fields.go b/metricbeat/module/kvm/fields.go index 9b4f2e7e211d..7dd21356f954 100644 --- a/metricbeat/module/kvm/fields.go +++ b/metricbeat/module/kvm/fields.go @@ -20,7 +20,7 @@ package kvm import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/logstash/fields.go b/metricbeat/module/logstash/fields.go index 8bf468ea3718..a1f6963e9c00 100644 --- a/metricbeat/module/logstash/fields.go +++ b/metricbeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/logstash/logstash.go b/metricbeat/module/logstash/logstash.go index d53933421243..3e5e57ac1c20 100644 --- a/metricbeat/module/logstash/logstash.go +++ b/metricbeat/module/logstash/logstash.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/logstash/logstash_integration_test.go b/metricbeat/module/logstash/logstash_integration_test.go index 379d6aabaf26..30dca909a1ea 100644 --- a/metricbeat/module/logstash/logstash_integration_test.go +++ b/metricbeat/module/logstash/logstash_integration_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/logstash" - _ "github.com/elastic/beats/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/metricbeat/module/logstash/node_stats" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/logstash" + _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node" + _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node_stats" ) var metricSets = []string{ diff --git a/metricbeat/module/logstash/node/data.go b/metricbeat/module/logstash/node/data.go index 525ea1b014e7..b1a6ef97ae41 100644 --- a/metricbeat/module/logstash/node/data.go +++ b/metricbeat/module/logstash/node/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) var ( diff --git a/metricbeat/module/logstash/node/data_test.go b/metricbeat/module/logstash/node/data_test.go index d9f72a642d81..65539432d8a8 100644 --- a/metricbeat/module/logstash/node/data_test.go +++ b/metricbeat/module/logstash/node/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node/data_xpack.go b/metricbeat/module/logstash/node/data_xpack.go index c076cf3a41ae..96fc252158c4 100644 --- a/metricbeat/module/logstash/node/data_xpack.go +++ b/metricbeat/module/logstash/node/data_xpack.go @@ -20,10 +20,10 @@ package node import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, pipelines []logstash.PipelineState, overrideClusterUUID string) error { diff --git a/metricbeat/module/logstash/node/node.go b/metricbeat/module/logstash/node/node.go index e076e990ac24..025d013e7566 100644 --- a/metricbeat/module/logstash/node/node.go +++ b/metricbeat/module/logstash/node/node.go @@ -18,9 +18,9 @@ package node import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/logstash/node_stats/data.go b/metricbeat/module/logstash/node_stats/data.go index 052a5b4ad315..da2f2f3b7c36 100644 --- a/metricbeat/module/logstash/node_stats/data.go +++ b/metricbeat/module/logstash/node_stats/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) var ( diff --git a/metricbeat/module/logstash/node_stats/data_test.go b/metricbeat/module/logstash/node_stats/data_test.go index dc824ac68173..2ae2407ca9e6 100644 --- a/metricbeat/module/logstash/node_stats/data_test.go +++ b/metricbeat/module/logstash/node_stats/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node_stats/data_xpack.go b/metricbeat/module/logstash/node_stats/data_xpack.go index 442bf43ebf22..a6a9867b7cde 100644 --- a/metricbeat/module/logstash/node_stats/data_xpack.go +++ b/metricbeat/module/logstash/node_stats/data_xpack.go @@ -21,13 +21,13 @@ import ( "encoding/json" "time" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/module/logstash" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) type jvm struct { diff --git a/metricbeat/module/logstash/node_stats/node_stats.go b/metricbeat/module/logstash/node_stats/node_stats.go index 7e212585b551..29a5a7d59c3b 100644 --- a/metricbeat/module/logstash/node_stats/node_stats.go +++ b/metricbeat/module/logstash/node_stats/node_stats.go @@ -20,9 +20,9 @@ package node_stats import ( "sync" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/memcached/fields.go b/metricbeat/module/memcached/fields.go index c675dce5afe9..d9fa12ddab89 100644 --- a/metricbeat/module/memcached/fields.go +++ b/metricbeat/module/memcached/fields.go @@ -20,7 +20,7 @@ package memcached import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/memcached/stats/data.go b/metricbeat/module/memcached/stats/data.go index e3b1b57ea0b5..9d7bf9fac6d7 100644 --- a/metricbeat/module/memcached/stats/data.go +++ b/metricbeat/module/memcached/stats/data.go @@ -18,8 +18,8 @@ package stats import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/memcached/stats/stats.go b/metricbeat/module/memcached/stats/stats.go index 52c938a63428..fc0e0f3d084a 100644 --- a/metricbeat/module/memcached/stats/stats.go +++ b/metricbeat/module/memcached/stats/stats.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "tcp"}.Build() diff --git a/metricbeat/module/memcached/stats/stats_integration_test.go b/metricbeat/module/memcached/stats/stats_integration_test.go index cc3e21e028aa..7c3a6222ae66 100644 --- a/metricbeat/module/memcached/stats/stats_integration_test.go +++ b/metricbeat/module/memcached/stats/stats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/mongodb/collstats/collstats.go b/metricbeat/module/mongodb/collstats/collstats.go index c39de01a18aa..ebf7db992cef 100644 --- a/metricbeat/module/mongodb/collstats/collstats.go +++ b/metricbeat/module/mongodb/collstats/collstats.go @@ -20,9 +20,9 @@ package collstats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/collstats/collstats_integration_test.go b/metricbeat/module/mongodb/collstats/collstats_integration_test.go index 2ef510797dca..7d135fb51a35 100644 --- a/metricbeat/module/mongodb/collstats/collstats_integration_test.go +++ b/metricbeat/module/mongodb/collstats/collstats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/collstats/data.go b/metricbeat/module/mongodb/collstats/data.go index b07e9d8a6d80..5d70c68f7f36 100644 --- a/metricbeat/module/mongodb/collstats/data.go +++ b/metricbeat/module/mongodb/collstats/data.go @@ -21,7 +21,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(key string, data common.MapStr) (common.MapStr, error) { diff --git a/metricbeat/module/mongodb/collstats/data_test.go b/metricbeat/module/mongodb/collstats/data_test.go index 8b0cbf220b22..5c2c7ae36d51 100644 --- a/metricbeat/module/mongodb/collstats/data_test.go +++ b/metricbeat/module/mongodb/collstats/data_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mongodb/dbstats/data.go b/metricbeat/module/mongodb/dbstats/data.go index 05514a0eca8a..15b57fef448a 100644 --- a/metricbeat/module/mongodb/dbstats/data.go +++ b/metricbeat/module/mongodb/dbstats/data.go @@ -18,8 +18,8 @@ package dbstats import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var schema = s.Schema{ diff --git a/metricbeat/module/mongodb/dbstats/dbstats.go b/metricbeat/module/mongodb/dbstats/dbstats.go index 6325b98342a8..4153793ed26b 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats.go +++ b/metricbeat/module/mongodb/dbstats/dbstats.go @@ -20,10 +20,10 @@ package dbstats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) var logger = logp.NewLogger("mongodb.dbstats") diff --git a/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go b/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go index 6eb2b47d7f0f..70c34006ac8d 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go +++ b/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/fields.go b/metricbeat/module/mongodb/fields.go index d58cbd012548..ae38c9b87248 100644 --- a/metricbeat/module/mongodb/fields.go +++ b/metricbeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mongodb/metrics/data.go b/metricbeat/module/mongodb/metrics/data.go index 920cf6f07777..30f166e7d6eb 100644 --- a/metricbeat/module/mongodb/metrics/data.go +++ b/metricbeat/module/mongodb/metrics/data.go @@ -18,8 +18,8 @@ package metrics import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var schemaMetrics = s.Schema{ diff --git a/metricbeat/module/mongodb/metrics/metrics.go b/metricbeat/module/mongodb/metrics/metrics.go index 5681b160a2b6..da2b0ddb6759 100644 --- a/metricbeat/module/mongodb/metrics/metrics.go +++ b/metricbeat/module/mongodb/metrics/metrics.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "gopkg.in/mgo.v2/bson" - "github.com/elastic/beats/libbeat/common/schema" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/metrics/metrics_intergration_test.go b/metricbeat/module/mongodb/metrics/metrics_intergration_test.go index 8100c9adb17d..c5415356afbf 100644 --- a/metricbeat/module/mongodb/metrics/metrics_intergration_test.go +++ b/metricbeat/module/mongodb/metrics/metrics_intergration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/metricset.go b/metricbeat/module/mongodb/metricset.go index cc75df8048ea..b1b09a7ac4da 100644 --- a/metricbeat/module/mongodb/metricset.go +++ b/metricbeat/module/mongodb/metricset.go @@ -23,9 +23,9 @@ import ( "gopkg.in/mgo.v2" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ModuleConfig contains the common configuration for this module diff --git a/metricbeat/module/mongodb/mongodb.go b/metricbeat/module/mongodb/mongodb.go index 57747684e399..23f9ceb5b225 100644 --- a/metricbeat/module/mongodb/mongodb.go +++ b/metricbeat/module/mongodb/mongodb.go @@ -22,9 +22,9 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" mgo "gopkg.in/mgo.v2" ) diff --git a/metricbeat/module/mongodb/mongodb_test.go b/metricbeat/module/mongodb/mongodb_test.go index 6b5a46a036a2..61756b1e6bd8 100644 --- a/metricbeat/module/mongodb/mongodb_test.go +++ b/metricbeat/module/mongodb/mongodb_test.go @@ -20,7 +20,7 @@ package mongodb import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mongodb/replstatus/data.go b/metricbeat/module/mongodb/replstatus/data.go index cf2539c1eecc..fdeeb2b53814 100644 --- a/metricbeat/module/mongodb/replstatus/data.go +++ b/metricbeat/module/mongodb/replstatus/data.go @@ -18,7 +18,7 @@ package replstatus import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(oplogInfo oplogInfo, replStatus MongoReplStatus) common.MapStr { diff --git a/metricbeat/module/mongodb/replstatus/replstatus.go b/metricbeat/module/mongodb/replstatus/replstatus.go index 8e693ea11176..fd734823490f 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus.go +++ b/metricbeat/module/mongodb/replstatus/replstatus.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go b/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go index afb1b082b3ce..12f010ee3540 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go +++ b/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go @@ -27,10 +27,10 @@ import ( mgo "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/status/data.go b/metricbeat/module/mongodb/status/data.go index 749a69768ca0..ef254eca56c2 100644 --- a/metricbeat/module/mongodb/status/data.go +++ b/metricbeat/module/mongodb/status/data.go @@ -18,8 +18,8 @@ package status import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var schema = s.Schema{ diff --git a/metricbeat/module/mongodb/status/status.go b/metricbeat/module/mongodb/status/status.go index c874ad3e9db6..8615d84e3582 100644 --- a/metricbeat/module/mongodb/status/status.go +++ b/metricbeat/module/mongodb/status/status.go @@ -20,9 +20,9 @@ package status import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" "gopkg.in/mgo.v2/bson" ) diff --git a/metricbeat/module/mongodb/status/status_integration_test.go b/metricbeat/module/mongodb/status/status_integration_test.go index c13f47073ab1..0d69a03d3f74 100644 --- a/metricbeat/module/mongodb/status/status_integration_test.go +++ b/metricbeat/module/mongodb/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go index 3d879b85f9ed..4201760b3982 100644 --- a/metricbeat/module/munin/fields.go +++ b/metricbeat/module/munin/fields.go @@ -20,7 +20,7 @@ package munin import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/munin/munin.go b/metricbeat/module/munin/munin.go index 7c2fd40c0d82..39837a42bcd1 100644 --- a/metricbeat/module/munin/munin.go +++ b/metricbeat/module/munin/munin.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/munin/munin_test.go b/metricbeat/module/munin/munin_test.go index 1da93165ddb9..9ae6407d7ee8 100644 --- a/metricbeat/module/munin/munin_test.go +++ b/metricbeat/module/munin/munin_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func dummyNode(response string) *Node { diff --git a/metricbeat/module/munin/node/node.go b/metricbeat/module/munin/node/node.go index 62c15bd77e9d..529031a500c7 100644 --- a/metricbeat/module/munin/node/node.go +++ b/metricbeat/module/munin/node/node.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/munin" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/munin" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/munin/node/node_integration_test.go b/metricbeat/module/munin/node/node_integration_test.go index 72fe1bf38b69..2fd4f0396ae3 100644 --- a/metricbeat/module/munin/node/node_integration_test.go +++ b/metricbeat/module/munin/node/node_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mysql/fields.go b/metricbeat/module/mysql/fields.go index 86d1346e1131..166d37fe7578 100644 --- a/metricbeat/module/mysql/fields.go +++ b/metricbeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mysql/galera_status/data.go b/metricbeat/module/mysql/galera_status/data.go index a15c010c85ae..82fa64c44b7c 100644 --- a/metricbeat/module/mysql/galera_status/data.go +++ b/metricbeat/module/mysql/galera_status/data.go @@ -18,9 +18,9 @@ package galera_status import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/mysql/galera_status/status.go b/metricbeat/module/mysql/galera_status/status.go index ba95a43f3a10..54b4d8a90d88 100644 --- a/metricbeat/module/mysql/galera_status/status.go +++ b/metricbeat/module/mysql/galera_status/status.go @@ -27,9 +27,9 @@ package galera_status import ( "database/sql" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mysql" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mysql" "github.com/pkg/errors" ) diff --git a/metricbeat/module/mysql/mysql.go b/metricbeat/module/mysql/mysql.go index 5497f92cc935..a98530ebd205 100644 --- a/metricbeat/module/mysql/mysql.go +++ b/metricbeat/module/mysql/mysql.go @@ -23,7 +23,7 @@ package mysql import ( "database/sql" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/go-sql-driver/mysql" "github.com/pkg/errors" diff --git a/metricbeat/module/mysql/mysql_integration_test.go b/metricbeat/module/mysql/mysql_integration_test.go index ff97f2d4ed8a..585cf011f9ea 100644 --- a/metricbeat/module/mysql/mysql_integration_test.go +++ b/metricbeat/module/mysql/mysql_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - _ "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + _ "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestNewDB(t *testing.T) { diff --git a/metricbeat/module/mysql/mysql_test.go b/metricbeat/module/mysql/mysql_test.go index 58f463d7f6de..1497dc78c355 100644 --- a/metricbeat/module/mysql/mysql_test.go +++ b/metricbeat/module/mysql/mysql_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mysql/status/data.go b/metricbeat/module/mysql/status/data.go index 79a4bc17266f..de1f9579e952 100644 --- a/metricbeat/module/mysql/status/data.go +++ b/metricbeat/module/mysql/status/data.go @@ -18,9 +18,9 @@ package status import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/mysql/status/status.go b/metricbeat/module/mysql/status/status.go index e8fd6a9ee00e..b2da6ec3551e 100644 --- a/metricbeat/module/mysql/status/status.go +++ b/metricbeat/module/mysql/status/status.go @@ -26,8 +26,8 @@ package status import ( "database/sql" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mysql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mysql" "github.com/pkg/errors" ) diff --git a/metricbeat/module/mysql/status/status_integration_test.go b/metricbeat/module/mysql/status/status_integration_test.go index 687d70337a88..2b0b2a510d99 100644 --- a/metricbeat/module/mysql/status/status_integration_test.go +++ b/metricbeat/module/mysql/status/status_integration_test.go @@ -22,10 +22,10 @@ package status import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/mysql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/mysql" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mysql/status/status_test.go b/metricbeat/module/mysql/status/status_test.go index f679f9eca3e2..f3e976ee0c5f 100644 --- a/metricbeat/module/mysql/status/status_test.go +++ b/metricbeat/module/mysql/status/status_test.go @@ -20,8 +20,8 @@ package status import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/nats/connections/connections.go b/metricbeat/module/nats/connections/connections.go index b331ec6e6283..4a158180bf4c 100644 --- a/metricbeat/module/nats/connections/connections.go +++ b/metricbeat/module/nats/connections/connections.go @@ -20,10 +20,10 @@ package connections import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/connections/connections_integration_test.go b/metricbeat/module/nats/connections/connections_integration_test.go index d5ea5c8dc122..a9758e42e698 100644 --- a/metricbeat/module/nats/connections/connections_integration_test.go +++ b/metricbeat/module/nats/connections/connections_integration_test.go @@ -22,8 +22,8 @@ package connections import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/connections/connections_test.go b/metricbeat/module/nats/connections/connections_test.go index 1261a1499f5d..8c32d6c92910 100644 --- a/metricbeat/module/nats/connections/connections_test.go +++ b/metricbeat/module/nats/connections/connections_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/connections/data.go b/metricbeat/module/nats/connections/data.go index 2966f8afd8d5..1efe616cb766 100644 --- a/metricbeat/module/nats/connections/data.go +++ b/metricbeat/module/nats/connections/data.go @@ -20,12 +20,12 @@ package connections import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/nats/fields.go b/metricbeat/module/nats/fields.go index d18374ff8593..215ffc0c5d22 100644 --- a/metricbeat/module/nats/fields.go +++ b/metricbeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nats/routes/data.go b/metricbeat/module/nats/routes/data.go index b33c51dd5b90..83581a16a311 100644 --- a/metricbeat/module/nats/routes/data.go +++ b/metricbeat/module/nats/routes/data.go @@ -20,12 +20,12 @@ package routes import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/nats/routes/routes.go b/metricbeat/module/nats/routes/routes.go index ac3337b5a3a2..91b3ad33930f 100644 --- a/metricbeat/module/nats/routes/routes.go +++ b/metricbeat/module/nats/routes/routes.go @@ -20,10 +20,10 @@ package routes import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/routes/routes_integration_test.go b/metricbeat/module/nats/routes/routes_integration_test.go index 306ee96a344c..a10e4be938ee 100644 --- a/metricbeat/module/nats/routes/routes_integration_test.go +++ b/metricbeat/module/nats/routes/routes_integration_test.go @@ -22,8 +22,8 @@ package routes import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/routes/routes_test.go b/metricbeat/module/nats/routes/routes_test.go index eed113547fa5..a76b35c5e1d5 100644 --- a/metricbeat/module/nats/routes/routes_test.go +++ b/metricbeat/module/nats/routes/routes_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/stats/data.go b/metricbeat/module/nats/stats/data.go index 3ec5865b8c58..594276d35bec 100644 --- a/metricbeat/module/nats/stats/data.go +++ b/metricbeat/module/nats/stats/data.go @@ -20,16 +20,16 @@ package stats import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/nats/stats/stats.go b/metricbeat/module/nats/stats/stats.go index e571661e4b51..f146e3f64455 100644 --- a/metricbeat/module/nats/stats/stats.go +++ b/metricbeat/module/nats/stats/stats.go @@ -20,10 +20,10 @@ package stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/stats/stats_integration_test.go b/metricbeat/module/nats/stats/stats_integration_test.go index 87585d8a17f0..b95447e9c9d9 100644 --- a/metricbeat/module/nats/stats/stats_integration_test.go +++ b/metricbeat/module/nats/stats/stats_integration_test.go @@ -22,8 +22,8 @@ package stats import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/stats/stats_test.go b/metricbeat/module/nats/stats/stats_test.go index 42c3872df7e9..922ccaf65f40 100644 --- a/metricbeat/module/nats/stats/stats_test.go +++ b/metricbeat/module/nats/stats/stats_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/subscriptions/data.go b/metricbeat/module/nats/subscriptions/data.go index 202faa3677da..a92bcae4b14c 100644 --- a/metricbeat/module/nats/subscriptions/data.go +++ b/metricbeat/module/nats/subscriptions/data.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/nats/subscriptions/subscriptions.go b/metricbeat/module/nats/subscriptions/subscriptions.go index 6333a295a6f1..f1cdfbaa0409 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions.go +++ b/metricbeat/module/nats/subscriptions/subscriptions.go @@ -20,10 +20,10 @@ package subscriptions import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go b/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go index 3b67d32a3ecc..909537b34754 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go +++ b/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go @@ -22,8 +22,8 @@ package subscriptions import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/subscriptions/subscriptions_test.go b/metricbeat/module/nats/subscriptions/subscriptions_test.go index 434800913462..d0b7e567b4e3 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions_test.go +++ b/metricbeat/module/nats/subscriptions/subscriptions_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nginx/fields.go b/metricbeat/module/nginx/fields.go index 0cb1749cd560..3cd6e0856eeb 100644 --- a/metricbeat/module/nginx/fields.go +++ b/metricbeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nginx/stubstatus/data.go b/metricbeat/module/nginx/stubstatus/data.go index 76044507e21c..c58cabe43dab 100644 --- a/metricbeat/module/nginx/stubstatus/data.go +++ b/metricbeat/module/nginx/stubstatus/data.go @@ -23,7 +23,7 @@ import ( "regexp" "strconv" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/metricbeat/module/nginx/stubstatus/stubstatus.go b/metricbeat/module/nginx/stubstatus/stubstatus.go index df613b20453e..e9696b971663 100644 --- a/metricbeat/module/nginx/stubstatus/stubstatus.go +++ b/metricbeat/module/nginx/stubstatus/stubstatus.go @@ -21,10 +21,10 @@ package stubstatus import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go b/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go index 82d25943075f..c1024f918f04 100644 --- a/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go +++ b/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go @@ -22,8 +22,8 @@ package stubstatus import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index 15f4d09fe511..7293bc9e2e2d 100644 --- a/metricbeat/module/php_fpm/fields.go +++ b/metricbeat/module/php_fpm/fields.go @@ -20,7 +20,7 @@ package php_fpm import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/php_fpm/pool/data.go b/metricbeat/module/php_fpm/pool/data.go index 356498116f55..a2d6c29a9dac 100644 --- a/metricbeat/module/php_fpm/pool/data.go +++ b/metricbeat/module/php_fpm/pool/data.go @@ -18,8 +18,8 @@ package pool import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/php_fpm/pool/pool.go b/metricbeat/module/php_fpm/pool/pool.go index ae346086d420..ec15fb46915a 100644 --- a/metricbeat/module/php_fpm/pool/pool.go +++ b/metricbeat/module/php_fpm/pool/pool.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/php_fpm" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/php_fpm" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/php_fpm/pool/pool_integration_test.go b/metricbeat/module/php_fpm/pool/pool_integration_test.go index caeaaa823a6d..84be99e00fb8 100644 --- a/metricbeat/module/php_fpm/pool/pool_integration_test.go +++ b/metricbeat/module/php_fpm/pool/pool_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/php_fpm/pool/pool_test.go b/metricbeat/module/php_fpm/pool/pool_test.go index 026cb72c04b8..ec3ea2f5a71e 100644 --- a/metricbeat/module/php_fpm/pool/pool_test.go +++ b/metricbeat/module/php_fpm/pool/pool_test.go @@ -22,9 +22,9 @@ package pool import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/php_fpm/process/data.go b/metricbeat/module/php_fpm/process/data.go index 705041b101b3..8a5d142ed051 100644 --- a/metricbeat/module/php_fpm/process/data.go +++ b/metricbeat/module/php_fpm/process/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type phpFpmStatus struct { diff --git a/metricbeat/module/php_fpm/process/process.go b/metricbeat/module/php_fpm/process/process.go index 85dde711ae3e..73a78e4ff13e 100644 --- a/metricbeat/module/php_fpm/process/process.go +++ b/metricbeat/module/php_fpm/process/process.go @@ -20,10 +20,10 @@ package process import ( "net/url" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/php_fpm" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/php_fpm" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/php_fpm/process/process_integration_test.go b/metricbeat/module/php_fpm/process/process_integration_test.go index 6fed9acf0cf4..0cb8f3fa1a5f 100644 --- a/metricbeat/module/php_fpm/process/process_integration_test.go +++ b/metricbeat/module/php_fpm/process/process_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/php_fpm/process/process_test.go b/metricbeat/module/php_fpm/process/process_test.go index 490a3bd2c201..7726226a27de 100644 --- a/metricbeat/module/php_fpm/process/process_test.go +++ b/metricbeat/module/php_fpm/process/process_test.go @@ -22,9 +22,9 @@ package process import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/php_fpm/url.go b/metricbeat/module/php_fpm/url.go index 7cb590309f81..544f18a089a1 100644 --- a/metricbeat/module/php_fpm/url.go +++ b/metricbeat/module/php_fpm/url.go @@ -18,7 +18,7 @@ package php_fpm import ( - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/plugin.go b/metricbeat/module/plugin.go index e96175de6f63..a1c408a2388f 100644 --- a/metricbeat/module/plugin.go +++ b/metricbeat/module/plugin.go @@ -20,9 +20,9 @@ package module import ( "errors" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) type modulePlugin struct { diff --git a/metricbeat/module/postgresql/activity/activity.go b/metricbeat/module/postgresql/activity/activity.go index ca519dc4442a..38c8f0ec6213 100644 --- a/metricbeat/module/postgresql/activity/activity.go +++ b/metricbeat/module/postgresql/activity/activity.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/postgresql/activity/activity_integration_test.go b/metricbeat/module/postgresql/activity/activity_integration_test.go index ab7c48d4fbd6..47a91c18ad40 100644 --- a/metricbeat/module/postgresql/activity/activity_integration_test.go +++ b/metricbeat/module/postgresql/activity/activity_integration_test.go @@ -22,10 +22,10 @@ package activity import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/activity/data.go b/metricbeat/module/postgresql/activity/data.go index b410d1ada611..7307c4467bfe 100644 --- a/metricbeat/module/postgresql/activity/data.go +++ b/metricbeat/module/postgresql/activity/data.go @@ -20,8 +20,8 @@ package activity import ( "time" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) // Based on: https://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW diff --git a/metricbeat/module/postgresql/bgwriter/bgwriter.go b/metricbeat/module/postgresql/bgwriter/bgwriter.go index 464c87dd6d30..bb7dd702b936 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go b/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go index d4d5c290e799..0302e6bf292c 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go @@ -22,10 +22,10 @@ package bgwriter import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/bgwriter/data.go b/metricbeat/module/postgresql/bgwriter/data.go index a1ab39404e7f..998a558ecc5d 100644 --- a/metricbeat/module/postgresql/bgwriter/data.go +++ b/metricbeat/module/postgresql/bgwriter/data.go @@ -20,8 +20,8 @@ package bgwriter import ( "time" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var schema = s.Schema{ diff --git a/metricbeat/module/postgresql/database/data.go b/metricbeat/module/postgresql/database/data.go index 90bee79f9763..99d2bdb643fb 100644 --- a/metricbeat/module/postgresql/database/data.go +++ b/metricbeat/module/postgresql/database/data.go @@ -20,8 +20,8 @@ package database import ( "time" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) // Based on https://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-DATABASE-VIEW diff --git a/metricbeat/module/postgresql/database/database.go b/metricbeat/module/postgresql/database/database.go index 4a960b81ead9..0b23a25d27b9 100644 --- a/metricbeat/module/postgresql/database/database.go +++ b/metricbeat/module/postgresql/database/database.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" // Register postgresql database/sql driver _ "github.com/lib/pq" diff --git a/metricbeat/module/postgresql/database/database_integration_test.go b/metricbeat/module/postgresql/database/database_integration_test.go index 9593ec2683c3..b64e410e73aa 100644 --- a/metricbeat/module/postgresql/database/database_integration_test.go +++ b/metricbeat/module/postgresql/database/database_integration_test.go @@ -22,10 +22,10 @@ package database import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/fields.go b/metricbeat/module/postgresql/fields.go index 2ded1e5f4ec3..065acbda7230 100644 --- a/metricbeat/module/postgresql/fields.go +++ b/metricbeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/postgresql/metricset.go b/metricbeat/module/postgresql/metricset.go index 07cd29f35049..0e591398cde5 100644 --- a/metricbeat/module/postgresql/metricset.go +++ b/metricbeat/module/postgresql/metricset.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" // Register postgresql database/sql driver _ "github.com/lib/pq" diff --git a/metricbeat/module/postgresql/postgresql.go b/metricbeat/module/postgresql/postgresql.go index 043aec486917..61bd5b1e9c41 100644 --- a/metricbeat/module/postgresql/postgresql.go +++ b/metricbeat/module/postgresql/postgresql.go @@ -28,8 +28,8 @@ import ( "github.com/lib/pq" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/postgresql/postgresql_test.go b/metricbeat/module/postgresql/postgresql_test.go index ff4f2ff63aee..85e3c7a332ee 100644 --- a/metricbeat/module/postgresql/postgresql_test.go +++ b/metricbeat/module/postgresql/postgresql_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/statement/data.go b/metricbeat/module/postgresql/statement/data.go index bb1c9ac0b742..6dbb9959a0e5 100644 --- a/metricbeat/module/postgresql/statement/data.go +++ b/metricbeat/module/postgresql/statement/data.go @@ -18,8 +18,8 @@ package statement import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) // Based on: https://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW diff --git a/metricbeat/module/postgresql/statement/statement.go b/metricbeat/module/postgresql/statement/statement.go index ed58361702d9..c874ec81adac 100644 --- a/metricbeat/module/postgresql/statement/statement.go +++ b/metricbeat/module/postgresql/statement/statement.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/postgresql/statement/statement_integration_test.go b/metricbeat/module/postgresql/statement/statement_integration_test.go index 3a707114cdc7..365a5acbdb87 100644 --- a/metricbeat/module/postgresql/statement/statement_integration_test.go +++ b/metricbeat/module/postgresql/statement/statement_integration_test.go @@ -22,10 +22,10 @@ package statement import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/prometheus/collector/collector.go b/metricbeat/module/prometheus/collector/collector.go index c23b08a1fa04..3a4ab55be3f5 100644 --- a/metricbeat/module/prometheus/collector/collector.go +++ b/metricbeat/module/prometheus/collector/collector.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" dto "github.com/prometheus/client_model/go" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/prometheus/collector/collector_test.go b/metricbeat/module/prometheus/collector/collector_test.go index 55bb2a9f1099..88a361c623e9 100644 --- a/metricbeat/module/prometheus/collector/collector_test.go +++ b/metricbeat/module/prometheus/collector/collector_test.go @@ -22,16 +22,16 @@ package collector import ( "testing" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/golang/protobuf/proto" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" ) func TestGetPromEventsFromMetricFamily(t *testing.T) { diff --git a/metricbeat/module/prometheus/collector/data.go b/metricbeat/module/prometheus/collector/data.go index 2ace395590e8..1651bf3752e9 100644 --- a/metricbeat/module/prometheus/collector/data.go +++ b/metricbeat/module/prometheus/collector/data.go @@ -21,8 +21,8 @@ import ( "math" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go index 5123688cad5e..244b9b62dd6b 100644 --- a/metricbeat/module/prometheus/fields.go +++ b/metricbeat/module/prometheus/fields.go @@ -20,7 +20,7 @@ package prometheus import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection.go b/metricbeat/module/rabbitmq/connection/connection.go index 76773460a7f6..e9cb4bce96ef 100644 --- a/metricbeat/module/rabbitmq/connection/connection.go +++ b/metricbeat/module/rabbitmq/connection/connection.go @@ -20,8 +20,8 @@ package connection import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection_test.go b/metricbeat/module/rabbitmq/connection/connection_test.go index 9dac8fb0661d..d5acf1abbb69 100644 --- a/metricbeat/module/rabbitmq/connection/connection_test.go +++ b/metricbeat/module/rabbitmq/connection/connection_test.go @@ -20,13 +20,13 @@ package connection import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq" + _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/rabbitmq/connection/data.go b/metricbeat/module/rabbitmq/connection/data.go index 81ad590a231f..6e499d2d66b8 100644 --- a/metricbeat/module/rabbitmq/connection/data.go +++ b/metricbeat/module/rabbitmq/connection/data.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/exchange/data.go b/metricbeat/module/rabbitmq/exchange/data.go index 73c398ee2fef..1ccda5060638 100644 --- a/metricbeat/module/rabbitmq/exchange/data.go +++ b/metricbeat/module/rabbitmq/exchange/data.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/exchange/exchange.go b/metricbeat/module/rabbitmq/exchange/exchange.go index 38353a89d827..969414b96222 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange.go +++ b/metricbeat/module/rabbitmq/exchange/exchange.go @@ -20,8 +20,8 @@ package exchange import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/exchange/exchange_test.go b/metricbeat/module/rabbitmq/exchange/exchange_test.go index cc550e34b597..6bb9136a634c 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange_test.go +++ b/metricbeat/module/rabbitmq/exchange/exchange_test.go @@ -20,9 +20,9 @@ package exchange import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go index 967ada610f85..7f8856f80afa 100644 --- a/metricbeat/module/rabbitmq/fields.go +++ b/metricbeat/module/rabbitmq/fields.go @@ -20,7 +20,7 @@ package rabbitmq import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/rabbitmq/metricset.go b/metricbeat/module/rabbitmq/metricset.go index e3de5c62104f..ab747dbc673e 100644 --- a/metricbeat/module/rabbitmq/metricset.go +++ b/metricbeat/module/rabbitmq/metricset.go @@ -18,8 +18,8 @@ package rabbitmq import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet can be used to build other metric sets that query RabbitMQ diff --git a/metricbeat/module/rabbitmq/metricset_test.go b/metricbeat/module/rabbitmq/metricset_test.go index 0c34908660b1..2d9d0c51cb5f 100644 --- a/metricbeat/module/rabbitmq/metricset_test.go +++ b/metricbeat/module/rabbitmq/metricset_test.go @@ -20,11 +20,11 @@ package rabbitmq import ( "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" ) var logger = logp.NewLogger("rabbitmq") diff --git a/metricbeat/module/rabbitmq/node/data.go b/metricbeat/module/rabbitmq/node/data.go index 4c5dc41d8701..2a84a1db029b 100644 --- a/metricbeat/module/rabbitmq/node/data.go +++ b/metricbeat/module/rabbitmq/node/data.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go index ac93f4d080bf..bd6a56f1b979 100644 --- a/metricbeat/module/rabbitmq/node/node.go +++ b/metricbeat/module/rabbitmq/node/node.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/node/node_integration_test.go b/metricbeat/module/rabbitmq/node/node_integration_test.go index 3a0760a67723..76d13ce863fa 100644 --- a/metricbeat/module/rabbitmq/node/node_integration_test.go +++ b/metricbeat/module/rabbitmq/node/node_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/rabbitmq/node/node_test.go b/metricbeat/module/rabbitmq/node/node_test.go index e8786aaa678f..bc68b824ebc7 100644 --- a/metricbeat/module/rabbitmq/node/node_test.go +++ b/metricbeat/module/rabbitmq/node/node_test.go @@ -20,9 +20,9 @@ package node import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/queue/data.go b/metricbeat/module/rabbitmq/queue/data.go index 2399f48e013b..a1d4b15a5c1c 100644 --- a/metricbeat/module/rabbitmq/queue/data.go +++ b/metricbeat/module/rabbitmq/queue/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/rabbitmq/queue/queue.go b/metricbeat/module/rabbitmq/queue/queue.go index 36346ceab1e0..b10b0ca00106 100644 --- a/metricbeat/module/rabbitmq/queue/queue.go +++ b/metricbeat/module/rabbitmq/queue/queue.go @@ -20,8 +20,8 @@ package queue import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/queue/queue_test.go b/metricbeat/module/rabbitmq/queue/queue_test.go index 41b5cd58b006..5c9438c2a641 100644 --- a/metricbeat/module/rabbitmq/queue/queue_test.go +++ b/metricbeat/module/rabbitmq/queue/queue_test.go @@ -20,9 +20,9 @@ package queue import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/url.go b/metricbeat/module/rabbitmq/url.go index a50f73acd7dc..299901811e86 100644 --- a/metricbeat/module/rabbitmq/url.go +++ b/metricbeat/module/rabbitmq/url.go @@ -18,7 +18,7 @@ package rabbitmq import ( - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // Subpaths to management plugin endpoints diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go index fd28937ec4b0..5ec77a243184 100644 --- a/metricbeat/module/redis/fields.go +++ b/metricbeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/redis/info/data.go b/metricbeat/module/redis/info/data.go index d1ac1bcc0f57..2e3b4e4b32f2 100644 --- a/metricbeat/module/redis/info/data.go +++ b/metricbeat/module/redis/info/data.go @@ -18,10 +18,10 @@ package info import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/redis/info/info.go b/metricbeat/module/redis/info/info.go index 0570710b2019..2d1f88c775de 100644 --- a/metricbeat/module/redis/info/info.go +++ b/metricbeat/module/redis/info/info.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/info/info_integration_test.go b/metricbeat/module/redis/info/info_integration_test.go index 576103c75d31..044685d4885c 100644 --- a/metricbeat/module/redis/info/info_integration_test.go +++ b/metricbeat/module/redis/info/info_integration_test.go @@ -22,9 +22,9 @@ package info import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/redis/info/info_test.go b/metricbeat/module/redis/info/info_test.go index bb02fc296922..99798bc95096 100644 --- a/metricbeat/module/redis/info/info_test.go +++ b/metricbeat/module/redis/info/info_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestNewMetricSet(t *testing.T) { diff --git a/metricbeat/module/redis/key/data.go b/metricbeat/module/redis/key/data.go index 076a5bce3490..d6fd8134d876 100644 --- a/metricbeat/module/redis/key/data.go +++ b/metricbeat/module/redis/key/data.go @@ -20,8 +20,8 @@ package key import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventMapping(keyspace uint, info map[string]interface{}) mb.Event { diff --git a/metricbeat/module/redis/key/key.go b/metricbeat/module/redis/key/key.go index 6eab8d0aeaaf..c01fe25a3185 100644 --- a/metricbeat/module/redis/key/key.go +++ b/metricbeat/module/redis/key/key.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/key/key_integration_test.go b/metricbeat/module/redis/key/key_integration_test.go index 2a804d9a63b6..bbe7b4831dca 100644 --- a/metricbeat/module/redis/key/key_integration_test.go +++ b/metricbeat/module/redis/key/key_integration_test.go @@ -26,9 +26,9 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/redis/keyspace/data.go b/metricbeat/module/redis/keyspace/data.go index e5050e4f4004..91f181305a96 100644 --- a/metricbeat/module/redis/keyspace/data.go +++ b/metricbeat/module/redis/keyspace/data.go @@ -20,11 +20,11 @@ package keyspace import ( "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/redis" ) // Map data to MapStr diff --git a/metricbeat/module/redis/keyspace/keyspace.go b/metricbeat/module/redis/keyspace/keyspace.go index fba7166341f2..a9710fa67f9b 100644 --- a/metricbeat/module/redis/keyspace/keyspace.go +++ b/metricbeat/module/redis/keyspace/keyspace.go @@ -20,9 +20,9 @@ package keyspace import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/keyspace/keyspace_integration_test.go b/metricbeat/module/redis/keyspace/keyspace_integration_test.go index e0b51c25dde7..239283f0f688 100644 --- a/metricbeat/module/redis/keyspace/keyspace_integration_test.go +++ b/metricbeat/module/redis/keyspace/keyspace_integration_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" rd "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/redis/metricset.go b/metricbeat/module/redis/metricset.go index 72e3a9f1e5f6..dbd600f48389 100644 --- a/metricbeat/module/redis/metricset.go +++ b/metricbeat/module/redis/metricset.go @@ -26,7 +26,7 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet for fetching Redis server information and statistics. diff --git a/metricbeat/module/redis/metricset_integration_test.go b/metricbeat/module/redis/metricset_integration_test.go index 7d972030bb37..6f59508c323d 100644 --- a/metricbeat/module/redis/metricset_integration_test.go +++ b/metricbeat/module/redis/metricset_integration_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( @@ -37,7 +37,7 @@ const ( ) func TestPasswords(t *testing.T) { - t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/issues/10955") + t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/v7/issues/10955") service := compose.EnsureUp(t, "redis") host := service.Host() diff --git a/metricbeat/module/redis/metricset_test.go b/metricbeat/module/redis/metricset_test.go index 9f9f5024f185..6e0235154068 100644 --- a/metricbeat/module/redis/metricset_test.go +++ b/metricbeat/module/redis/metricset_test.go @@ -22,7 +22,7 @@ package redis import ( "testing" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/redis/redis.go b/metricbeat/module/redis/redis.go index 11d55279f51d..2167a95fd7a5 100644 --- a/metricbeat/module/redis/redis.go +++ b/metricbeat/module/redis/redis.go @@ -26,7 +26,7 @@ import ( rd "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Redis types diff --git a/metricbeat/module/redis/redis_integration_test.go b/metricbeat/module/redis/redis_integration_test.go index c33df1556f0d..ccf6e59d46f4 100644 --- a/metricbeat/module/redis/redis_integration_test.go +++ b/metricbeat/module/redis/redis_integration_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - _ "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + _ "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchRedisInfo(t *testing.T) { diff --git a/metricbeat/module/system/core/config.go b/metricbeat/module/system/core/config.go index 1e8e0e11be95..e47b7d7cd5cc 100644 --- a/metricbeat/module/system/core/config.go +++ b/metricbeat/module/system/core/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // Core metric types. diff --git a/metricbeat/module/system/core/core.go b/metricbeat/module/system/core/core.go index 4c91b144cddc..9fdb3178a16c 100644 --- a/metricbeat/module/system/core/core.go +++ b/metricbeat/module/system/core/core.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/core/core_test.go b/metricbeat/module/system/core/core_test.go index c3c6c09a3b9c..3e8a66f7bd8a 100644 --- a/metricbeat/module/system/core/core_test.go +++ b/metricbeat/module/system/core/core_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/cpu/config.go b/metricbeat/module/system/cpu/config.go index 291ee7963ef0..4e19f25f512a 100644 --- a/metricbeat/module/system/cpu/config.go +++ b/metricbeat/module/system/cpu/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // CPU metric types. diff --git a/metricbeat/module/system/cpu/cpu.go b/metricbeat/module/system/cpu/cpu.go index d743cb5a2524..8d017f0d3733 100644 --- a/metricbeat/module/system/cpu/cpu.go +++ b/metricbeat/module/system/cpu/cpu.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/cpu/cpu_test.go b/metricbeat/module/system/cpu/cpu_test.go index e218399c0356..e3b7ba6645cb 100644 --- a/metricbeat/module/system/cpu/cpu_test.go +++ b/metricbeat/module/system/cpu/cpu_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskio.go b/metricbeat/module/system/diskio/diskio.go index d60d6f8bd5b5..80c494409a3b 100644 --- a/metricbeat/module/system/diskio/diskio.go +++ b/metricbeat/module/system/diskio/diskio.go @@ -20,9 +20,9 @@ package diskio import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/diskio/diskio_test.go b/metricbeat/module/system/diskio/diskio_test.go index 945fbe63785f..aabc44c374b8 100644 --- a/metricbeat/module/system/diskio/diskio_test.go +++ b/metricbeat/module/system/diskio/diskio_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskstat_linux.go b/metricbeat/module/system/diskio/diskstat_linux.go index edff3df61a54..4ecfdf700ac6 100644 --- a/metricbeat/module/system/diskio/diskstat_linux.go +++ b/metricbeat/module/system/diskio/diskstat_linux.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/disk" - "github.com/elastic/beats/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" ) func Get_CLK_TCK() uint32 { diff --git a/metricbeat/module/system/diskio/diskstat_linux_test.go b/metricbeat/module/system/diskio/diskstat_linux_test.go index 9687f278b871..56a8d9dc7cce 100644 --- a/metricbeat/module/system/diskio/diskstat_linux_test.go +++ b/metricbeat/module/system/diskio/diskstat_linux_test.go @@ -28,8 +28,8 @@ import ( sigar "github.com/elastic/gosigar" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/system" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/system" ) func Test_Get_CLK_TCK(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskstat_windows_helper.go b/metricbeat/module/system/diskio/diskstat_windows_helper.go index 158045c7749b..0e550a71f45f 100644 --- a/metricbeat/module/system/diskio/diskstat_windows_helper.go +++ b/metricbeat/module/system/diskio/diskstat_windows_helper.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/system/diskio/diskstat_windows_test.go b/metricbeat/module/system/diskio/diskstat_windows_test.go index c7536c4e7511..0f20f581212c 100644 --- a/metricbeat/module/system/diskio/diskstat_windows_test.go +++ b/metricbeat/module/system/diskio/diskstat_windows_test.go @@ -23,11 +23,11 @@ package diskio import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestCDriveFilterOnWindowsTestEnv(t *testing.T) { diff --git a/metricbeat/module/system/entropy/entropy.go b/metricbeat/module/system/entropy/entropy.go index 2e11973c0172..15792ae07efd 100644 --- a/metricbeat/module/system/entropy/entropy.go +++ b/metricbeat/module/system/entropy/entropy.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/system" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/system/entropy/entropy_test.go b/metricbeat/module/system/entropy/entropy_test.go index 4f5c85417177..ed4f94595ea7 100644 --- a/metricbeat/module/system/entropy/entropy_test.go +++ b/metricbeat/module/system/entropy/entropy_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/system" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/system" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 14c78146ecd4..a207118c3b86 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/system/filesystem/filesystem.go b/metricbeat/module/system/filesystem/filesystem.go index 0513e5d68d03..765a874cb75a 100644 --- a/metricbeat/module/system/filesystem/filesystem.go +++ b/metricbeat/module/system/filesystem/filesystem.go @@ -22,9 +22,9 @@ package filesystem import ( "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/filesystem/filesystem_test.go b/metricbeat/module/system/filesystem/filesystem_test.go index 2baa16c3f492..87ea5c072f32 100644 --- a/metricbeat/module/system/filesystem/filesystem_test.go +++ b/metricbeat/module/system/filesystem/filesystem_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/filesystem/helper.go b/metricbeat/module/system/filesystem/helper.go index b9386188747c..d64ef95f5627 100644 --- a/metricbeat/module/system/filesystem/helper.go +++ b/metricbeat/module/system/filesystem/helper.go @@ -29,8 +29,8 @@ import ( "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/system" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/fsstat/fsstat.go b/metricbeat/module/system/fsstat/fsstat.go index 84b08ab518a2..a8a1eaa0c94b 100644 --- a/metricbeat/module/system/fsstat/fsstat.go +++ b/metricbeat/module/system/fsstat/fsstat.go @@ -22,10 +22,10 @@ package fsstat import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system/filesystem" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system/filesystem" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/fsstat/fsstat_test.go b/metricbeat/module/system/fsstat/fsstat_test.go index 8a69c6e21827..df591a108989 100644 --- a/metricbeat/module/system/fsstat/fsstat_test.go +++ b/metricbeat/module/system/fsstat/fsstat_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/load/load.go b/metricbeat/module/system/load/load.go index ead230272d5b..1e7a6fe2b3bc 100644 --- a/metricbeat/module/system/load/load.go +++ b/metricbeat/module/system/load/load.go @@ -22,10 +22,10 @@ package load import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/load/load_test.go b/metricbeat/module/system/load/load_test.go index 82e2d5d09302..6a8fadcc797e 100644 --- a/metricbeat/module/system/load/load_test.go +++ b/metricbeat/module/system/load/load_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/memory/memory.go b/metricbeat/module/system/memory/memory.go index 76b3e6c0541b..90283f801bef 100644 --- a/metricbeat/module/system/memory/memory.go +++ b/metricbeat/module/system/memory/memory.go @@ -20,10 +20,10 @@ package memory import ( - "github.com/elastic/beats/libbeat/common" - mem "github.com/elastic/beats/libbeat/metric/system/memory" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + mem "github.com/elastic/beats/v7/libbeat/metric/system/memory" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/memory/memory_test.go b/metricbeat/module/system/memory/memory_test.go index 9d91c38fe501..978d2de8ae1e 100644 --- a/metricbeat/module/system/memory/memory_test.go +++ b/metricbeat/module/system/memory/memory_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/network/network.go b/metricbeat/module/system/network/network.go index abdcda11a984..d9c04d834202 100644 --- a/metricbeat/module/system/network/network.go +++ b/metricbeat/module/system/network/network.go @@ -22,10 +22,10 @@ package network import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" "github.com/shirou/gopsutil/net" diff --git a/metricbeat/module/system/network/network_test.go b/metricbeat/module/system/network/network_test.go index 28fb3aca809f..999a1b91cde8 100644 --- a/metricbeat/module/system/network/network_test.go +++ b/metricbeat/module/system/network/network_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/network_summary/data.go b/metricbeat/module/system/network_summary/data.go index 883f0c0d3170..95b530c93252 100644 --- a/metricbeat/module/system/network_summary/data.go +++ b/metricbeat/module/system/network_summary/data.go @@ -18,7 +18,7 @@ package network_summary import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" sysinfotypes "github.com/elastic/go-sysinfo/types" ) diff --git a/metricbeat/module/system/network_summary/network_summary.go b/metricbeat/module/system/network_summary/network_summary.go index ff2c7e163bff..bbb27d589b04 100644 --- a/metricbeat/module/system/network_summary/network_summary.go +++ b/metricbeat/module/system/network_summary/network_summary.go @@ -20,8 +20,8 @@ package network_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" sysinfo "github.com/elastic/go-sysinfo" sysinfotypes "github.com/elastic/go-sysinfo/types" ) diff --git a/metricbeat/module/system/network_summary/network_summary_test.go b/metricbeat/module/system/network_summary/network_summary_test.go index 85eef635b7ca..bd2ba95d0068 100644 --- a/metricbeat/module/system/network_summary/network_summary_test.go +++ b/metricbeat/module/system/network_summary/network_summary_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/go-sysinfo/types" ) diff --git a/metricbeat/module/system/process/cgroup.go b/metricbeat/module/system/process/cgroup.go index bd46e1addea1..c71dc7fe34d3 100644 --- a/metricbeat/module/system/process/cgroup.go +++ b/metricbeat/module/system/process/cgroup.go @@ -20,7 +20,7 @@ package process import ( "strconv" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/gosigar/cgroup" ) diff --git a/metricbeat/module/system/process/config.go b/metricbeat/module/system/process/config.go index 43caeb8b22ef..317515b93f08 100644 --- a/metricbeat/module/system/process/config.go +++ b/metricbeat/module/system/process/config.go @@ -18,8 +18,8 @@ package process import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/metric/system/process" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/metric/system/process" ) // Config stores the system/process config options diff --git a/metricbeat/module/system/process/process.go b/metricbeat/module/system/process/process.go index 98d941cc4f87..9c7541773726 100644 --- a/metricbeat/module/system/process/process.go +++ b/metricbeat/module/system/process/process.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system" "github.com/elastic/gosigar/cgroup" ) diff --git a/metricbeat/module/system/process/process_test.go b/metricbeat/module/system/process/process_test.go index 0ee4c76e00a3..c997410a4bb3 100644 --- a/metricbeat/module/system/process/process_test.go +++ b/metricbeat/module/system/process/process_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/process_summary/process_summary.go b/metricbeat/module/system/process_summary/process_summary.go index 4759869a2343..071a7b2a6608 100644 --- a/metricbeat/module/system/process_summary/process_summary.go +++ b/metricbeat/module/system/process_summary/process_summary.go @@ -22,11 +22,11 @@ package process_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/process_summary/process_summary_test.go b/metricbeat/module/system/process_summary/process_summary_test.go index 868ccf9542c1..55afce8f190e 100644 --- a/metricbeat/module/system/process_summary/process_summary_test.go +++ b/metricbeat/module/system/process_summary/process_summary_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/raid/blockinfo/blockinfo.go b/metricbeat/module/system/raid/blockinfo/blockinfo.go index cb5a62b6067c..f0dbd982238f 100644 --- a/metricbeat/module/system/raid/blockinfo/blockinfo.go +++ b/metricbeat/module/system/raid/blockinfo/blockinfo.go @@ -17,7 +17,7 @@ package blockinfo -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // SyncStatus represents the status of a sync action as Complete/Total. Will be 0/0 if no sync action is going on type SyncStatus struct { diff --git a/metricbeat/module/system/raid/blockinfo/parser.go b/metricbeat/module/system/raid/blockinfo/parser.go index 35dff46bd891..7d0eb7561dba 100644 --- a/metricbeat/module/system/raid/blockinfo/parser.go +++ b/metricbeat/module/system/raid/blockinfo/parser.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var debugf = logp.MakeDebug("system.raid") diff --git a/metricbeat/module/system/raid/raid.go b/metricbeat/module/system/raid/raid.go index 78f497ba0f01..bf542dbb93b9 100644 --- a/metricbeat/module/system/raid/raid.go +++ b/metricbeat/module/system/raid/raid.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/procfs" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" - "github.com/elastic/beats/metricbeat/module/system/raid/blockinfo" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system" + "github.com/elastic/beats/v7/metricbeat/module/system/raid/blockinfo" ) func init() { diff --git a/metricbeat/module/system/raid/raid_test.go b/metricbeat/module/system/raid/raid_test.go index cfbd2881d64e..f1ebaa97270b 100644 --- a/metricbeat/module/system/raid/raid_test.go +++ b/metricbeat/module/system/raid/raid_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/service/data.go b/metricbeat/module/system/service/data.go index 36c143df63c8..eda9eae0f6ab 100644 --- a/metricbeat/module/system/service/data.go +++ b/metricbeat/module/system/service/data.go @@ -22,11 +22,11 @@ package service import ( "time" - "github.com/coreos/go-systemd/dbus" + "github.com/coreos/go-systemd/v22/dbus" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Properties is a struct representation of the dbus returns from GetAllProperties diff --git a/metricbeat/module/system/service/service.go b/metricbeat/module/system/service/service.go index ca5db61319b2..d29859418943 100644 --- a/metricbeat/module/system/service/service.go +++ b/metricbeat/module/system/service/service.go @@ -20,12 +20,12 @@ package service import ( - "github.com/coreos/go-systemd/dbus" + "github.com/coreos/go-systemd/v22/dbus" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Config stores the config object diff --git a/metricbeat/module/system/service/service_test.go b/metricbeat/module/system/service/service_test.go index 0335bc11129c..53f4343981dc 100644 --- a/metricbeat/module/system/service/service_test.go +++ b/metricbeat/module/system/service/service_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/coreos/go-systemd/dbus" + "github.com/coreos/go-systemd/v22/dbus" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFormProps(t *testing.T) { diff --git a/metricbeat/module/system/socket/socket.go b/metricbeat/module/system/socket/socket.go index 72d6b31184c6..bca2b795af19 100644 --- a/metricbeat/module/system/socket/socket.go +++ b/metricbeat/module/system/socket/socket.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - sock "github.com/elastic/beats/metricbeat/helper/socket" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + sock "github.com/elastic/beats/v7/metricbeat/helper/socket" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system" "github.com/elastic/gosigar/sys/linux" ) diff --git a/metricbeat/module/system/socket/socket_test.go b/metricbeat/module/system/socket/socket_test.go index 7430e7f2c37d..ccf23d99d7ab 100644 --- a/metricbeat/module/system/socket/socket_test.go +++ b/metricbeat/module/system/socket/socket_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - sock "github.com/elastic/beats/metricbeat/helper/socket" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + sock "github.com/elastic/beats/v7/metricbeat/helper/socket" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/socket_summary/socket_summary.go b/metricbeat/module/system/socket_summary/socket_summary.go index 7a4b6714e6fb..a57187cfd4eb 100644 --- a/metricbeat/module/system/socket_summary/socket_summary.go +++ b/metricbeat/module/system/socket_summary/socket_summary.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/system/socket_summary/sockstat_linux.go b/metricbeat/module/system/socket_summary/sockstat_linux.go index 799456b66705..60836b6c1c28 100644 --- a/metricbeat/module/system/socket_summary/sockstat_linux.go +++ b/metricbeat/module/system/socket_summary/sockstat_linux.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/system" ) // SockStat contains data from /proc/net/sockstat diff --git a/metricbeat/module/system/socket_summary/sockstat_other.go b/metricbeat/module/system/socket_summary/sockstat_other.go index eabaa26ead8b..495c7d31c7b3 100644 --- a/metricbeat/module/system/socket_summary/sockstat_other.go +++ b/metricbeat/module/system/socket_summary/sockstat_other.go @@ -22,7 +22,7 @@ package socket_summary import ( "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) //a stub function for non-linux systems diff --git a/metricbeat/module/system/system.go b/metricbeat/module/system/system.go index 6f0ac639694e..edb9f55bf6b4 100644 --- a/metricbeat/module/system/system.go +++ b/metricbeat/module/system/system.go @@ -21,7 +21,7 @@ import ( "flag" "sync" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/system/system_windows.go b/metricbeat/module/system/system_windows.go index b59e6c94bbba..154481eb657e 100644 --- a/metricbeat/module/system/system_windows.go +++ b/metricbeat/module/system/system_windows.go @@ -18,8 +18,8 @@ package system import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" ) func initModule() { diff --git a/metricbeat/module/system/uptime/uptime.go b/metricbeat/module/system/uptime/uptime.go index 1e4ebeada431..cbefa8bd4b46 100644 --- a/metricbeat/module/system/uptime/uptime.go +++ b/metricbeat/module/system/uptime/uptime.go @@ -22,9 +22,9 @@ package uptime import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/uptime/uptime_test.go b/metricbeat/module/system/uptime/uptime_test.go index f7262b51003f..d0542c50db09 100644 --- a/metricbeat/module/system/uptime/uptime_test.go +++ b/metricbeat/module/system/uptime/uptime_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go index 435d812f901d..d18ad7398e8c 100644 --- a/metricbeat/module/traefik/fields.go +++ b/metricbeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/traefik/health/data.go b/metricbeat/module/traefik/health/data.go index 5cc5bc5020d9..5d00a02399da 100644 --- a/metricbeat/module/traefik/health/data.go +++ b/metricbeat/module/traefik/health/data.go @@ -18,9 +18,9 @@ package health import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/traefik/health/data_test.go b/metricbeat/module/traefik/health/data_test.go index 1b0d2731ad11..ad710e43d2ed 100644 --- a/metricbeat/module/traefik/health/data_test.go +++ b/metricbeat/module/traefik/health/data_test.go @@ -22,7 +22,7 @@ package health import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go index 619d4444db9b..23e94e9619c8 100644 --- a/metricbeat/module/traefik/health/health.go +++ b/metricbeat/module/traefik/health/health.go @@ -20,10 +20,10 @@ package health import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/traefik/health/health_integration_test.go b/metricbeat/module/traefik/health/health_integration_test.go index cb97424ce293..6f9aa36f48b4 100644 --- a/metricbeat/module/traefik/health/health_integration_test.go +++ b/metricbeat/module/traefik/health/health_integration_test.go @@ -23,9 +23,9 @@ import ( "net/http" "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/traefik/mtest" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/traefik/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/traefik/health/health_test.go b/metricbeat/module/traefik/health/health_test.go index a0de08d6a7fa..7d96d7d88fa0 100644 --- a/metricbeat/module/traefik/health/health_test.go +++ b/metricbeat/module/traefik/health/health_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/traefik" + _ "github.com/elastic/beats/v7/metricbeat/module/traefik" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/uwsgi/fields.go b/metricbeat/module/uwsgi/fields.go index ae4bbd43f230..120cb4a8a24d 100644 --- a/metricbeat/module/uwsgi/fields.go +++ b/metricbeat/module/uwsgi/fields.go @@ -20,7 +20,7 @@ package uwsgi import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/uwsgi/status/data.go b/metricbeat/module/uwsgi/status/data.go index 437fdcbb0ee9..7b371a44b780 100644 --- a/metricbeat/module/uwsgi/status/data.go +++ b/metricbeat/module/uwsgi/status/data.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type uwsgiCore struct { diff --git a/metricbeat/module/uwsgi/status/status.go b/metricbeat/module/uwsgi/status/status.go index 84971e553999..334662d89794 100644 --- a/metricbeat/module/uwsgi/status/status.go +++ b/metricbeat/module/uwsgi/status/status.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/uwsgi" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/uwsgi" ) func init() { diff --git a/metricbeat/module/uwsgi/status/status_integration_test.go b/metricbeat/module/uwsgi/status/status_integration_test.go index 97b869f4a3e5..cfcf9271dc6e 100644 --- a/metricbeat/module/uwsgi/status/status_integration_test.go +++ b/metricbeat/module/uwsgi/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchTCP(t *testing.T) { diff --git a/metricbeat/module/uwsgi/status/status_linux_test.go b/metricbeat/module/uwsgi/status/status_linux_test.go index 68934f4d6f3a..bbd84faf85a7 100644 --- a/metricbeat/module/uwsgi/status/status_linux_test.go +++ b/metricbeat/module/uwsgi/status/status_linux_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchDataUnixSock(t *testing.T) { diff --git a/metricbeat/module/uwsgi/status/status_test.go b/metricbeat/module/uwsgi/status/status_test.go index 9bb4b55dfb4d..30fc0867a47d 100644 --- a/metricbeat/module/uwsgi/status/status_test.go +++ b/metricbeat/module/uwsgi/status/status_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func testData(t *testing.T) (data []byte) { diff --git a/metricbeat/module/uwsgi/uwsgi.go b/metricbeat/module/uwsgi/uwsgi.go index 4455955cc342..42f8be1eabf9 100644 --- a/metricbeat/module/uwsgi/uwsgi.go +++ b/metricbeat/module/uwsgi/uwsgi.go @@ -18,8 +18,8 @@ package uwsgi import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // HostParser is used for parsing the configured uWSGI hosts. diff --git a/metricbeat/module/uwsgi/uwsgi_test.go b/metricbeat/module/uwsgi/uwsgi_test.go index af19fe437e98..79ebf0eac667 100644 --- a/metricbeat/module/uwsgi/uwsgi_test.go +++ b/metricbeat/module/uwsgi/uwsgi_test.go @@ -20,7 +20,7 @@ package uwsgi import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go index e3e87ffebb1b..44ddb1ac65bd 100644 --- a/metricbeat/module/vsphere/datastore/datastore.go +++ b/metricbeat/module/vsphere/datastore/datastore.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/vmware/govmomi" "github.com/vmware/govmomi/view" diff --git a/metricbeat/module/vsphere/datastore/datastore_test.go b/metricbeat/module/vsphere/datastore/datastore_test.go index c8891fdfc466..30f1d32e8e37 100644 --- a/metricbeat/module/vsphere/datastore/datastore_test.go +++ b/metricbeat/module/vsphere/datastore/datastore_test.go @@ -20,7 +20,7 @@ package datastore import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index 22e671f12f5d..cf49cbee27ff 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -20,7 +20,7 @@ package vsphere import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/vsphere/host/data.go b/metricbeat/module/vsphere/host/data.go index 642f1230298f..81ceba8c43a5 100644 --- a/metricbeat/module/vsphere/host/data.go +++ b/metricbeat/module/vsphere/host/data.go @@ -18,7 +18,7 @@ package host import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/vmware/govmomi/vim25/mo" ) diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go index 1a2f7f69c86a..90f5e89a6f77 100644 --- a/metricbeat/module/vsphere/host/host.go +++ b/metricbeat/module/vsphere/host/host.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/vmware/govmomi" "github.com/vmware/govmomi/property" diff --git a/metricbeat/module/vsphere/host/host_test.go b/metricbeat/module/vsphere/host/host_test.go index da5b97f799e2..ce9ee1ba80f1 100644 --- a/metricbeat/module/vsphere/host/host_test.go +++ b/metricbeat/module/vsphere/host/host_test.go @@ -20,8 +20,8 @@ package host import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index fae77b32fe88..5dd2a99675fc 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -23,9 +23,9 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" "github.com/vmware/govmomi" diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go index fb640c48fdce..e3b12feaf4b7 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/windows/fields.go b/metricbeat/module/windows/fields.go index db3aaeccc64c..34f9f8b78612 100644 --- a/metricbeat/module/windows/fields.go +++ b/metricbeat/module/windows/fields.go @@ -20,7 +20,7 @@ package windows import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/windows/perfmon/perfmon.go b/metricbeat/module/windows/perfmon/perfmon.go index fffd5d6cfb59..76f8833b3f04 100644 --- a/metricbeat/module/windows/perfmon/perfmon.go +++ b/metricbeat/module/windows/perfmon/perfmon.go @@ -22,13 +22,13 @@ package perfmon import ( "strings" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // CounterConfig for perfmon counters. diff --git a/metricbeat/module/windows/perfmon/perfmon_test.go b/metricbeat/module/windows/perfmon/perfmon_test.go index 1d43286e1517..cd882131b541 100644 --- a/metricbeat/module/windows/perfmon/perfmon_test.go +++ b/metricbeat/module/windows/perfmon/perfmon_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const processorTimeCounter = `\Processor Information(_Total)\% Processor Time` diff --git a/metricbeat/module/windows/perfmon/reader.go b/metricbeat/module/windows/perfmon/reader.go index 22b6b5f89ddd..a7ecd6663621 100644 --- a/metricbeat/module/windows/perfmon/reader.go +++ b/metricbeat/module/windows/perfmon/reader.go @@ -25,13 +25,13 @@ import ( "strconv" "strings" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) var processRegexp = regexp.MustCompile(`(.+?)#[1-9]+`) diff --git a/metricbeat/module/windows/service/doc.go b/metricbeat/module/windows/service/doc.go index 1bcbc98e250c..a766843e5042 100644 --- a/metricbeat/module/windows/service/doc.go +++ b/metricbeat/module/windows/service/doc.go @@ -21,4 +21,4 @@ package service //go:generate go run ../../../helper/windows/run.go -cmd "go tool cgo -godefs defs_service_windows.go" -goarch amd64 -output defs_service_windows_amd64.go //go:generate go run ../../../helper/windows/run.go -cmd "go tool cgo -godefs defs_service_windows.go" -goarch 386 -output defs_service_windows_386.go //go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zservice_windows.go service_windows.go -//go:generate gofmt -w defs_service_windows_amd64.go defs_service_windows_386.go +//go:generate goimports -w defs_service_windows_amd64.go defs_service_windows_386.go diff --git a/metricbeat/module/windows/service/service.go b/metricbeat/module/windows/service/service.go index 628ec8d35c73..fce48ab6cff6 100644 --- a/metricbeat/module/windows/service/service.go +++ b/metricbeat/module/windows/service/service.go @@ -20,7 +20,7 @@ package service import ( - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/windows/service/service_integration_windows_test.go b/metricbeat/module/windows/service/service_integration_windows_test.go index c3ac032c03b1..51306fe5c37e 100644 --- a/metricbeat/module/windows/service/service_integration_windows_test.go +++ b/metricbeat/module/windows/service/service_integration_windows_test.go @@ -22,12 +22,12 @@ package service import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/StackExchange/wmi" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) type Win32Service struct { diff --git a/metricbeat/module/windows/service/service_windows.go b/metricbeat/module/windows/service/service_windows.go index a96b1c386868..877be4e854f2 100644 --- a/metricbeat/module/windows/service/service_windows.go +++ b/metricbeat/module/windows/service/service_windows.go @@ -33,9 +33,9 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/sys" "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/windows/windows.go b/metricbeat/module/windows/windows.go index 6629e00ecc6d..584817e6a369 100644 --- a/metricbeat/module/windows/windows.go +++ b/metricbeat/module/windows/windows.go @@ -22,9 +22,9 @@ package windows import ( "sync" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) var once sync.Once diff --git a/metricbeat/module/zookeeper/connection/connection.go b/metricbeat/module/zookeeper/connection/connection.go index 31540d00b880..dea21844c7ca 100644 --- a/metricbeat/module/zookeeper/connection/connection.go +++ b/metricbeat/module/zookeeper/connection/connection.go @@ -20,10 +20,10 @@ package connection import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/zookeeper" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/zookeeper/connection/connection_integration_test.go b/metricbeat/module/zookeeper/connection/connection_integration_test.go index 257268f26b18..f774f36c202f 100644 --- a/metricbeat/module/zookeeper/connection/connection_integration_test.go +++ b/metricbeat/module/zookeeper/connection/connection_integration_test.go @@ -22,8 +22,8 @@ package connection import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/zookeeper/connection/connection_test.go b/metricbeat/module/zookeeper/connection/connection_test.go index 253153d3422e..6477a7776320 100644 --- a/metricbeat/module/zookeeper/connection/connection_test.go +++ b/metricbeat/module/zookeeper/connection/connection_test.go @@ -21,7 +21,7 @@ import ( "bytes" "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/zookeeper/connection/data.go b/metricbeat/module/zookeeper/connection/data.go index a30c61e62ba8..e205ba8594f9 100644 --- a/metricbeat/module/zookeeper/connection/data.go +++ b/metricbeat/module/zookeeper/connection/data.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var capturer = regexp.MustCompile(`/(?P.*):(?P\d+)\[(?P\d*)]\(queued=(?P\d*),recved=(?P\d*),sent=(?P\d*)\)`) diff --git a/metricbeat/module/zookeeper/fields.go b/metricbeat/module/zookeeper/fields.go index 41a234d28608..c275c78c4798 100644 --- a/metricbeat/module/zookeeper/fields.go +++ b/metricbeat/module/zookeeper/fields.go @@ -20,7 +20,7 @@ package zookeeper import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/zookeeper/mntr/data.go b/metricbeat/module/zookeeper/mntr/data.go index f116984eb898..5dc2dd3b4725 100644 --- a/metricbeat/module/zookeeper/mntr/data.go +++ b/metricbeat/module/zookeeper/mntr/data.go @@ -22,12 +22,12 @@ import ( "io" "regexp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/zookeeper/mntr/mntr.go b/metricbeat/module/zookeeper/mntr/mntr.go index 13fd8770afa2..af5831b8007f 100644 --- a/metricbeat/module/zookeeper/mntr/mntr.go +++ b/metricbeat/module/zookeeper/mntr/mntr.go @@ -44,9 +44,9 @@ ZooKeeper mntr Command Output package mntr import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/zookeeper" "github.com/pkg/errors" ) diff --git a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go index 7e530c802ce4..34e36321a5df 100644 --- a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go +++ b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/zookeeper/server/data.go b/metricbeat/module/zookeeper/server/data.go index ef74f1aee3ba..9f185e3a218d 100644 --- a/metricbeat/module/zookeeper/server/data.go +++ b/metricbeat/module/zookeeper/server/data.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var latencyCapturer = regexp.MustCompile(`(\d+)/(\d+)/(\d+)`) diff --git a/metricbeat/module/zookeeper/server/server.go b/metricbeat/module/zookeeper/server/server.go index 7b9d275382db..af57d4e77b82 100644 --- a/metricbeat/module/zookeeper/server/server.go +++ b/metricbeat/module/zookeeper/server/server.go @@ -42,11 +42,11 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/zookeeper" ) func init() { diff --git a/metricbeat/module/zookeeper/server/server_integration_test.go b/metricbeat/module/zookeeper/server/server_integration_test.go index 4cd1764ad168..6f23559033bc 100644 --- a/metricbeat/module/zookeeper/server/server_integration_test.go +++ b/metricbeat/module/zookeeper/server/server_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/zookeeper/server/server_test.go b/metricbeat/module/zookeeper/server/server_test.go index 0ac31050f013..442770ce613e 100644 --- a/metricbeat/module/zookeeper/server/server_test.go +++ b/metricbeat/module/zookeeper/server/server_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var srvrTestInput = `Zookeeper version: 3.5.5-390fe37ea45dee01bf87dc1c042b5e3dcce88653, built on 05/03/2019 12:07 GMT diff --git a/metricbeat/processor/add_kubernetes_metadata/indexers.go b/metricbeat/processor/add_kubernetes_metadata/indexers.go index a86b4b8f211d..b169b93f481a 100644 --- a/metricbeat/processor/add_kubernetes_metadata/indexers.go +++ b/metricbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,8 +18,8 @@ package add_kubernetes_metadata import ( - "github.com/elastic/beats/libbeat/common" - kubernetes "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/metricbeat/scripts/assets/assets.go b/metricbeat/scripts/assets/assets.go index 45ebfe46969b..51c24afe4528 100644 --- a/metricbeat/scripts/assets/assets.go +++ b/metricbeat/scripts/assets/assets.go @@ -24,9 +24,9 @@ import ( "os" "path" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/generator/fields" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/licenses" ) func main() { diff --git a/metricbeat/scripts/mage/config.go b/metricbeat/scripts/mage/config.go index d9e8c5fc581a..ffa30d27bad3 100644 --- a/metricbeat/scripts/mage/config.go +++ b/metricbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml" diff --git a/metricbeat/scripts/mage/docs_collector.go b/metricbeat/scripts/mage/docs_collector.go index 21c99aceb50b..427975a7cf10 100644 --- a/metricbeat/scripts/mage/docs_collector.go +++ b/metricbeat/scripts/mage/docs_collector.go @@ -32,7 +32,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage" ) // moduleData provides module-level data that will be used to populate the module list @@ -146,8 +146,12 @@ func getDefaultMetricsets() (map[string][]string, error) { return masterMap, nil } + cmd := []string{"run"} + if mage.UseVendor { + cmd = append(cmd, "-mod", "vendor") + } for _, dir := range runpaths { - rawMap, err := sh.OutCmd("go", "run", dir)() + rawMap, err := sh.OutCmd("go", append(cmd, dir)...)() if err != nil { return nil, errors.Wrap(err, "Error running subcommand to get metricsets") } diff --git a/metricbeat/scripts/mage/fields.go b/metricbeat/scripts/mage/fields.go index df3441ecf861..a46110fee928 100644 --- a/metricbeat/scripts/mage/fields.go +++ b/metricbeat/scripts/mage/fields.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // GenerateOSSMetricbeatModuleIncludeListGo generates include/list_{suffix}.go files containing diff --git a/metricbeat/scripts/mage/package.go b/metricbeat/scripts/mage/package.go index 1f527114f02d..15498e8028f7 100644 --- a/metricbeat/scripts/mage/package.go +++ b/metricbeat/scripts/mage/package.go @@ -28,7 +28,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/metricbeat/scripts/module/metricset/metricset.go.tmpl b/metricbeat/scripts/module/metricset/metricset.go.tmpl index e2c455cb6497..a156abd916f0 100644 --- a/metricbeat/scripts/module/metricset/metricset.go.tmpl +++ b/metricbeat/scripts/module/metricset/metricset.go.tmpl @@ -1,9 +1,9 @@ package {metricset} import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/scripts/msetlists/cmd/main.go b/metricbeat/scripts/msetlists/cmd/main.go index d964f79b0d2b..fec8aa0f1e1d 100644 --- a/metricbeat/scripts/msetlists/cmd/main.go +++ b/metricbeat/scripts/msetlists/cmd/main.go @@ -22,10 +22,10 @@ import ( "fmt" "os" - "github.com/elastic/beats/libbeat/paths" - _ "github.com/elastic/beats/metricbeat/include" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/scripts/msetlists" + "github.com/elastic/beats/v7/libbeat/paths" + _ "github.com/elastic/beats/v7/metricbeat/include" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/scripts/msetlists" ) func main() { diff --git a/metricbeat/scripts/msetlists/msetlists.go b/metricbeat/scripts/msetlists/msetlists.go index 7ede799ab10e..2280bcf2b6db 100644 --- a/metricbeat/scripts/msetlists/msetlists.go +++ b/metricbeat/scripts/msetlists/msetlists.go @@ -20,7 +20,7 @@ package msetlists import ( "strings" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // DefaultMetricsets returns a JSON array of all registered default metricsets diff --git a/packetbeat/beater/packetbeat.go b/packetbeat/beater/packetbeat.go index c7c6d53046fd..b862bd3ee112 100644 --- a/packetbeat/beater/packetbeat.go +++ b/packetbeat/beater/packetbeat.go @@ -26,25 +26,25 @@ import ( "github.com/tsg/gopacket/layers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/service" - - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/decoder" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/icmp" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/protos/udp" - "github.com/elastic/beats/packetbeat/publish" - "github.com/elastic/beats/packetbeat/sniffer" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/service" + + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/decoder" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/icmp" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos/udp" + "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/sniffer" // Add packetbeat default processors - _ "github.com/elastic/beats/packetbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/packetbeat/processor/add_kubernetes_metadata" ) // Beater object. Contains all objects needed to run the beat diff --git a/packetbeat/cmd/devices.go b/packetbeat/cmd/devices.go index 388232064c24..4635b822ab4b 100644 --- a/packetbeat/cmd/devices.go +++ b/packetbeat/cmd/devices.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/packetbeat/sniffer" + "github.com/elastic/beats/v7/packetbeat/sniffer" ) func genDevicesCommand() *cobra.Command { diff --git a/packetbeat/cmd/root.go b/packetbeat/cmd/root.go index bb8479f5e5f6..addc5fe5ad67 100644 --- a/packetbeat/cmd/root.go +++ b/packetbeat/cmd/root.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/pflag" // import protocol modules - _ "github.com/elastic/beats/packetbeat/include" + _ "github.com/elastic/beats/v7/packetbeat/include" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/packetbeat/beater" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/packetbeat/beater" ) // Name of this beat diff --git a/packetbeat/config/config.go b/packetbeat/config/config.go index 45d79efd1d28..893e4828ab8f 100644 --- a/packetbeat/config/config.go +++ b/packetbeat/config/config.go @@ -20,9 +20,9 @@ package config import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/packetbeat/procs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/packetbeat/procs" ) type Config struct { diff --git a/packetbeat/decoder/decoder.go b/packetbeat/decoder/decoder.go index 3aba33b7f88a..50e8f5954818 100644 --- a/packetbeat/decoder/decoder.go +++ b/packetbeat/decoder/decoder.go @@ -20,12 +20,12 @@ package decoder import ( "fmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/icmp" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/protos/udp" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/icmp" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos/udp" "github.com/tsg/gopacket" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/decoder/decoder_test.go b/packetbeat/decoder/decoder_test.go index 90a33024fff4..954be381da03 100644 --- a/packetbeat/decoder/decoder_test.go +++ b/packetbeat/decoder/decoder_test.go @@ -23,9 +23,9 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" "github.com/tsg/gopacket" diff --git a/packetbeat/flows/flows.go b/packetbeat/flows/flows.go index e3efb1a8ef8e..fb292b92bf2e 100644 --- a/packetbeat/flows/flows.go +++ b/packetbeat/flows/flows.go @@ -20,9 +20,9 @@ package flows import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/config" ) type Flows struct { diff --git a/packetbeat/flows/flows_test.go b/packetbeat/flows/flows_test.go index 06c903bd2a42..b1c3a5b83b93 100644 --- a/packetbeat/flows/flows_test.go +++ b/packetbeat/flows/flows_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/config" ) type flowsChan struct { diff --git a/packetbeat/flows/util.go b/packetbeat/flows/util.go index ab68c6ac446c..c5b928fae426 100644 --- a/packetbeat/flows/util.go +++ b/packetbeat/flows/util.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) type worker struct { diff --git a/packetbeat/flows/worker.go b/packetbeat/flows/worker.go index 80fbeb025654..8bfce02084a3 100644 --- a/packetbeat/flows/worker.go +++ b/packetbeat/flows/worker.go @@ -23,11 +23,11 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/flowhash" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type flowsProcessor struct { diff --git a/packetbeat/flows/worker_test.go b/packetbeat/flows/worker_test.go index c6d59c849a64..dab0d11eb14d 100644 --- a/packetbeat/flows/worker_test.go +++ b/packetbeat/flows/worker_test.go @@ -28,8 +28,8 @@ import ( "github.com/elastic/go-lookslike" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go index 7edd0216bd9f..1a8b22f1572d 100644 --- a/packetbeat/include/fields.go +++ b/packetbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/include/list.go b/packetbeat/include/list.go index b5210f59448d..0dc1f0bd053c 100644 --- a/packetbeat/include/list.go +++ b/packetbeat/include/list.go @@ -21,18 +21,18 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/packetbeat/protos/amqp" - _ "github.com/elastic/beats/packetbeat/protos/cassandra" - _ "github.com/elastic/beats/packetbeat/protos/dhcpv4" - _ "github.com/elastic/beats/packetbeat/protos/dns" - _ "github.com/elastic/beats/packetbeat/protos/http" - _ "github.com/elastic/beats/packetbeat/protos/icmp" - _ "github.com/elastic/beats/packetbeat/protos/memcache" - _ "github.com/elastic/beats/packetbeat/protos/mongodb" - _ "github.com/elastic/beats/packetbeat/protos/mysql" - _ "github.com/elastic/beats/packetbeat/protos/nfs" - _ "github.com/elastic/beats/packetbeat/protos/pgsql" - _ "github.com/elastic/beats/packetbeat/protos/redis" - _ "github.com/elastic/beats/packetbeat/protos/thrift" - _ "github.com/elastic/beats/packetbeat/protos/tls" + _ "github.com/elastic/beats/v7/packetbeat/protos/amqp" + _ "github.com/elastic/beats/v7/packetbeat/protos/cassandra" + _ "github.com/elastic/beats/v7/packetbeat/protos/dhcpv4" + _ "github.com/elastic/beats/v7/packetbeat/protos/dns" + _ "github.com/elastic/beats/v7/packetbeat/protos/http" + _ "github.com/elastic/beats/v7/packetbeat/protos/icmp" + _ "github.com/elastic/beats/v7/packetbeat/protos/memcache" + _ "github.com/elastic/beats/v7/packetbeat/protos/mongodb" + _ "github.com/elastic/beats/v7/packetbeat/protos/mysql" + _ "github.com/elastic/beats/v7/packetbeat/protos/nfs" + _ "github.com/elastic/beats/v7/packetbeat/protos/pgsql" + _ "github.com/elastic/beats/v7/packetbeat/protos/redis" + _ "github.com/elastic/beats/v7/packetbeat/protos/thrift" + _ "github.com/elastic/beats/v7/packetbeat/protos/tls" ) diff --git a/packetbeat/magefile.go b/packetbeat/magefile.go index e7a3afd24314..7793ed32ec07 100644 --- a/packetbeat/magefile.go +++ b/packetbeat/magefile.go @@ -31,13 +31,13 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - packetbeat "github.com/elastic/beats/packetbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + packetbeat "github.com/elastic/beats/v7/packetbeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" ) func init() { @@ -280,7 +280,7 @@ var crossBuildDeps = map[string]func() error{ // buildLibpcapFromSource builds libpcap from source because the library needs // to be compiled with -fPIC. -// See https://github.com/elastic/beats/pull/4217. +// See https://github.com/elastic/beats/v7/pull/4217. func buildLibpcapFromSource(params map[string]string) error { tarFile, err := devtools.DownloadFile(libpcapURL, "/libpcap") if err != nil { @@ -422,7 +422,7 @@ func generateWin64StaticWinpcap() error { // Notes: We are using absolute path to make sure the files // are available for x-pack build. - // Ref: https://github.com/elastic/beats/issues/1259 + // Ref: https://github.com/elastic/beats/v7/issues/1259 defer devtools.DockerChown(devtools.MustExpand("{{elastic_beats_dir}}/{{.BeatName}}/lib")) return devtools.RunCmds( // Requires mingw-w64-tools. diff --git a/packetbeat/main.go b/packetbeat/main.go index aa6ec0921494..c2b064f21881 100644 --- a/packetbeat/main.go +++ b/packetbeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/packetbeat/cmd" + "github.com/elastic/beats/v7/packetbeat/cmd" ) var Name = "packetbeat" diff --git a/packetbeat/main_test.go b/packetbeat/main_test.go index 93697593f25d..80c9d76920d4 100644 --- a/packetbeat/main_test.go +++ b/packetbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/packetbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/packetbeat/cmd" ) var systemTest *bool diff --git a/packetbeat/pb/event.go b/packetbeat/pb/event.go index ebed6ebb708d..d4330b542eac 100644 --- a/packetbeat/pb/event.go +++ b/packetbeat/pb/event.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/flowhash" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/pb/event_test.go b/packetbeat/pb/event_test.go index 788003d7691d..b44bd4c5c4c3 100644 --- a/packetbeat/pb/event_test.go +++ b/packetbeat/pb/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/processor/add_kubernetes_metadata/indexers.go b/packetbeat/processor/add_kubernetes_metadata/indexers.go index 5283f299e619..474f111e97fe 100644 --- a/packetbeat/processor/add_kubernetes_metadata/indexers.go +++ b/packetbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,8 +18,8 @@ package add_kubernetes_metadata import ( - "github.com/elastic/beats/libbeat/common" - kubernetes "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/packetbeat/procs/procs.go b/packetbeat/procs/procs.go index b94cdaa5b825..dfead47d93cb 100644 --- a/packetbeat/procs/procs.go +++ b/packetbeat/procs/procs.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" "github.com/elastic/go-sysinfo" ) diff --git a/packetbeat/procs/procs_linux.go b/packetbeat/procs/procs_linux.go index e9a48ccfdada..944924c88b16 100644 --- a/packetbeat/procs/procs_linux.go +++ b/packetbeat/procs/procs_linux.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" "github.com/elastic/gosigar" ) diff --git a/packetbeat/procs/procs_linux_test.go b/packetbeat/procs/procs_linux_test.go index 72fdd4c0fb5e..25a856ed2f8b 100644 --- a/packetbeat/procs/procs_linux_test.go +++ b/packetbeat/procs/procs_linux_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type testProcFile struct { diff --git a/packetbeat/procs/procs_other.go b/packetbeat/procs/procs_other.go index 50c7d1e100fd..0e401806aba7 100644 --- a/packetbeat/procs/procs_other.go +++ b/packetbeat/procs/procs_other.go @@ -19,7 +19,7 @@ package procs -import "github.com/elastic/beats/packetbeat/protos/applayer" +import "github.com/elastic/beats/v7/packetbeat/protos/applayer" // GetLocalPortToPIDMapping returns the list of local port numbers and the PID // that owns them. diff --git a/packetbeat/procs/procs_test.go b/packetbeat/procs/procs_test.go index ca71152c8233..359640d0bcb6 100644 --- a/packetbeat/procs/procs_test.go +++ b/packetbeat/procs/procs_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type testingImpl struct { diff --git a/packetbeat/procs/procs_windows.go b/packetbeat/procs/procs_windows.go index 87919d18af99..b18bd792841c 100644 --- a/packetbeat/procs/procs_windows.go +++ b/packetbeat/procs/procs_windows.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) var machineEndiannes = getMachineEndiannes() diff --git a/packetbeat/protocols/plugin.go b/packetbeat/protocols/plugin.go index 565850981814..46fd784e64b0 100644 --- a/packetbeat/protocols/plugin.go +++ b/packetbeat/protocols/plugin.go @@ -20,8 +20,8 @@ package protocols import ( "errors" - "github.com/elastic/beats/libbeat/plugin" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v7/packetbeat/protos" ) type protocolPlugin struct { diff --git a/packetbeat/protos/amqp/amqp.go b/packetbeat/protos/amqp/amqp.go index f2a2ca026012..8b5689e4f2e7 100644 --- a/packetbeat/protos/amqp/amqp.go +++ b/packetbeat/protos/amqp/amqp.go @@ -22,13 +22,13 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) var ( diff --git a/packetbeat/protos/amqp/amqp_fields.go b/packetbeat/protos/amqp/amqp_fields.go index 1926e734558e..ff4f7c382b5c 100644 --- a/packetbeat/protos/amqp/amqp_fields.go +++ b/packetbeat/protos/amqp/amqp_fields.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func getTable(fields common.MapStr, data []byte, offset uint32) (next uint32, err bool, exists bool) { diff --git a/packetbeat/protos/amqp/amqp_methods.go b/packetbeat/protos/amqp/amqp_methods.go index b3936e973828..93cec5f27474 100644 --- a/packetbeat/protos/amqp/amqp_methods.go +++ b/packetbeat/protos/amqp/amqp_methods.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func connectionStartMethod(m *amqpMessage, args []byte) (bool, bool) { diff --git a/packetbeat/protos/amqp/amqp_parser.go b/packetbeat/protos/amqp/amqp_parser.go index 2e59641bd903..eeaaf2a94646 100644 --- a/packetbeat/protos/amqp/amqp_parser.go +++ b/packetbeat/protos/amqp/amqp_parser.go @@ -21,9 +21,9 @@ import ( "encoding/binary" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" ) func (amqp *amqpPlugin) amqpMessageParser(s *amqpStream) (ok bool, complete bool) { diff --git a/packetbeat/protos/amqp/amqp_structs.go b/packetbeat/protos/amqp/amqp_structs.go index 17d253994e72..387e8df6fcb4 100644 --- a/packetbeat/protos/amqp/amqp_structs.go +++ b/packetbeat/protos/amqp/amqp_structs.go @@ -20,7 +20,7 @@ package amqp import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type amqpMethod func(*amqpMessage, []byte) (bool, bool) diff --git a/packetbeat/protos/amqp/amqp_test.go b/packetbeat/protos/amqp/amqp_test.go index 6a17068ac4c0..d9f583cdc22b 100644 --- a/packetbeat/protos/amqp/amqp_test.go +++ b/packetbeat/protos/amqp/amqp_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/amqp/config.go b/packetbeat/protos/amqp/config.go index 67db3ec2b541..2939530046ee 100644 --- a/packetbeat/protos/amqp/config.go +++ b/packetbeat/protos/amqp/config.go @@ -18,8 +18,8 @@ package amqp import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type amqpConfig struct { diff --git a/packetbeat/protos/amqp/fields.go b/packetbeat/protos/amqp/fields.go index 863436c0a293..d8f3457a9afa 100644 --- a/packetbeat/protos/amqp/fields.go +++ b/packetbeat/protos/amqp/fields.go @@ -20,7 +20,7 @@ package amqp import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/applayer/applayer.go b/packetbeat/protos/applayer/applayer.go index 21b740c73e12..597edb0d0eb2 100644 --- a/packetbeat/protos/applayer/applayer.go +++ b/packetbeat/protos/applayer/applayer.go @@ -23,11 +23,11 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/pb" ) // A Message its direction indicator diff --git a/packetbeat/protos/cassandra/cassandra.go b/packetbeat/protos/cassandra/cassandra.go index 495095ae9e4f..ed0f48e91a44 100644 --- a/packetbeat/protos/cassandra/cassandra.go +++ b/packetbeat/protos/cassandra/cassandra.go @@ -20,13 +20,13 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" ) // cassandra application level protocol analyzer plugin diff --git a/packetbeat/protos/cassandra/config.go b/packetbeat/protos/cassandra/config.go index 74262631c40e..0eafddcd1ee0 100644 --- a/packetbeat/protos/cassandra/config.go +++ b/packetbeat/protos/cassandra/config.go @@ -20,10 +20,10 @@ package cassandra import ( "fmt" - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" ) type cassandraConfig struct { diff --git a/packetbeat/protos/cassandra/fields.go b/packetbeat/protos/cassandra/fields.go index 8fbec81bde79..f8730fd902e3 100644 --- a/packetbeat/protos/cassandra/fields.go +++ b/packetbeat/protos/cassandra/fields.go @@ -20,7 +20,7 @@ package cassandra import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/cassandra/internal/gocql/frame.go b/packetbeat/protos/cassandra/internal/gocql/frame.go index 52ded24d5ccb..25e7df5bac88 100644 --- a/packetbeat/protos/cassandra/internal/gocql/frame.go +++ b/packetbeat/protos/cassandra/internal/gocql/frame.go @@ -23,8 +23,8 @@ import ( "runtime" "sync" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/packetbeat/protos/cassandra/internal/gocql/marshal.go b/packetbeat/protos/cassandra/internal/gocql/marshal.go index 207d52928390..2061bb2f11e8 100644 --- a/packetbeat/protos/cassandra/internal/gocql/marshal.go +++ b/packetbeat/protos/cassandra/internal/gocql/marshal.go @@ -28,7 +28,7 @@ import ( "gopkg.in/inf.v0" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TypeInfo describes a Cassandra specific data type. diff --git a/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go b/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go index 0450b5368789..ae107a95e9ed 100644 --- a/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go +++ b/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type StreamDecoder struct { diff --git a/packetbeat/protos/cassandra/parser.go b/packetbeat/protos/cassandra/parser.go index 7729b1ee619f..f699187b03f3 100644 --- a/packetbeat/protos/cassandra/parser.go +++ b/packetbeat/protos/cassandra/parser.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" ) type parser struct { diff --git a/packetbeat/protos/cassandra/pub.go b/packetbeat/protos/cassandra/pub.go index 2f79295ee03b..c4d0164310e4 100644 --- a/packetbeat/protos/cassandra/pub.go +++ b/packetbeat/protos/cassandra/pub.go @@ -20,11 +20,11 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Transaction Publisher. diff --git a/packetbeat/protos/cassandra/trans.go b/packetbeat/protos/cassandra/trans.go index 49eb7be7cafd..62d36ee36955 100644 --- a/packetbeat/protos/cassandra/trans.go +++ b/packetbeat/protos/cassandra/trans.go @@ -20,10 +20,10 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type transactions struct { diff --git a/packetbeat/protos/dhcpv4/config.go b/packetbeat/protos/dhcpv4/config.go index 7f2825de9637..4121ee66ba75 100644 --- a/packetbeat/protos/dhcpv4/config.go +++ b/packetbeat/protos/dhcpv4/config.go @@ -18,7 +18,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) type dhcpv4Config struct { diff --git a/packetbeat/protos/dhcpv4/dhcpv4.go b/packetbeat/protos/dhcpv4/dhcpv4.go index 19b81c0717e1..a50108a83c6b 100644 --- a/packetbeat/protos/dhcpv4/dhcpv4.go +++ b/packetbeat/protos/dhcpv4/dhcpv4.go @@ -23,12 +23,12 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/dhcpv4/dhcpv4_test.go b/packetbeat/protos/dhcpv4/dhcpv4_test.go index 56d9428ebe2b..72aade5014e3 100644 --- a/packetbeat/protos/dhcpv4/dhcpv4_test.go +++ b/packetbeat/protos/dhcpv4/dhcpv4_test.go @@ -26,11 +26,11 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) var _ protos.UDPPlugin = &dhcpv4Plugin{} diff --git a/packetbeat/protos/dhcpv4/fields.go b/packetbeat/protos/dhcpv4/fields.go index b63c2a7e4c4e..19fae17fd5fd 100644 --- a/packetbeat/protos/dhcpv4/fields.go +++ b/packetbeat/protos/dhcpv4/fields.go @@ -20,7 +20,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dhcpv4/options.go b/packetbeat/protos/dhcpv4/options.go index fcee2bc3c3b1..68ec4e8c32ce 100644 --- a/packetbeat/protos/dhcpv4/options.go +++ b/packetbeat/protos/dhcpv4/options.go @@ -26,7 +26,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func optionsToMap(options []dhcpv4.Option) (common.MapStr, error) { diff --git a/packetbeat/protos/dns/config.go b/packetbeat/protos/dns/config.go index d8e43be7e105..c98d52f8257f 100644 --- a/packetbeat/protos/dns/config.go +++ b/packetbeat/protos/dns/config.go @@ -18,8 +18,8 @@ package dns import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type dnsConfig struct { diff --git a/packetbeat/protos/dns/dns.go b/packetbeat/protos/dns/dns.go index 3633847b0fbe..dc0227815b81 100644 --- a/packetbeat/protos/dns/dns.go +++ b/packetbeat/protos/dns/dns.go @@ -34,11 +34,11 @@ import ( mkdns "github.com/miekg/dns" "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" ) type dnsPlugin struct { diff --git a/packetbeat/protos/dns/dns_tcp.go b/packetbeat/protos/dns/dns_tcp.go index bce95d6c7660..310cf43553e3 100644 --- a/packetbeat/protos/dns/dns_tcp.go +++ b/packetbeat/protos/dns/dns_tcp.go @@ -20,12 +20,12 @@ package dns import ( "encoding/binary" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" mkdns "github.com/miekg/dns" ) diff --git a/packetbeat/protos/dns/dns_tcp_test.go b/packetbeat/protos/dns/dns_tcp_test.go index 3f2e12d155d4..18e499afd389 100644 --- a/packetbeat/protos/dns/dns_tcp_test.go +++ b/packetbeat/protos/dns/dns_tcp_test.go @@ -33,9 +33,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) // Verify that the interface TCP has been satisfied. diff --git a/packetbeat/protos/dns/dns_test.go b/packetbeat/protos/dns/dns_test.go index b5a57bf024d4..db20a19126f9 100644 --- a/packetbeat/protos/dns/dns_test.go +++ b/packetbeat/protos/dns/dns_test.go @@ -31,11 +31,11 @@ import ( mkdns "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) // Test Constants diff --git a/packetbeat/protos/dns/dns_udp.go b/packetbeat/protos/dns/dns_udp.go index d563a97837b7..652e03bb7174 100644 --- a/packetbeat/protos/dns/dns_udp.go +++ b/packetbeat/protos/dns/dns_udp.go @@ -18,10 +18,10 @@ package dns import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Only EDNS packets should have their size beyond this value diff --git a/packetbeat/protos/dns/dns_udp_test.go b/packetbeat/protos/dns/dns_udp_test.go index 486b4a11bce9..3a0ca655505c 100644 --- a/packetbeat/protos/dns/dns_udp_test.go +++ b/packetbeat/protos/dns/dns_udp_test.go @@ -40,8 +40,8 @@ import ( mkdns "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Verify that the interface for UDP has been satisfied. diff --git a/packetbeat/protos/dns/fields.go b/packetbeat/protos/dns/fields.go index ac3d950bea21..2c20d2faa00d 100644 --- a/packetbeat/protos/dns/fields.go +++ b/packetbeat/protos/dns/fields.go @@ -20,7 +20,7 @@ package dns import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dns/names_test.go b/packetbeat/protos/dns/names_test.go index 25c31881016a..9066082cab8a 100644 --- a/packetbeat/protos/dns/names_test.go +++ b/packetbeat/protos/dns/names_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type dnsTestMsg struct { diff --git a/packetbeat/protos/http/config.go b/packetbeat/protos/http/config.go index 2197dbad088f..19f5ab203933 100644 --- a/packetbeat/protos/http/config.go +++ b/packetbeat/protos/http/config.go @@ -18,9 +18,9 @@ package http import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type httpConfig struct { diff --git a/packetbeat/protos/http/event.go b/packetbeat/protos/http/event.go index f02aae421623..691f8b1d1560 100644 --- a/packetbeat/protos/http/event.go +++ b/packetbeat/protos/http/event.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/http/fields.go b/packetbeat/protos/http/fields.go index 1c4efb516d26..079579e89b01 100644 --- a/packetbeat/protos/http/fields.go +++ b/packetbeat/protos/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/http/http.go b/packetbeat/protos/http/http.go index 69821429c6c5..4e40ad60ba0c 100644 --- a/packetbeat/protos/http/http.go +++ b/packetbeat/protos/http/http.go @@ -28,13 +28,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/http/http_parser.go b/packetbeat/protos/http/http_parser.go index 8548d0ecf7c7..748ea9dc712b 100644 --- a/packetbeat/protos/http/http_parser.go +++ b/packetbeat/protos/http/http_parser.go @@ -25,10 +25,10 @@ import ( "time" "unicode" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) // Http Message diff --git a/packetbeat/protos/http/http_test.go b/packetbeat/protos/http/http_test.go index 12e56feefedb..5b782e2052ef 100644 --- a/packetbeat/protos/http/http_test.go +++ b/packetbeat/protos/http/http_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type testParser struct { diff --git a/packetbeat/protos/icmp/config.go b/packetbeat/protos/icmp/config.go index 6e4113cd52ea..cb3ee28d7f92 100644 --- a/packetbeat/protos/icmp/config.go +++ b/packetbeat/protos/icmp/config.go @@ -20,7 +20,7 @@ package icmp import ( "time" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" ) type icmpConfig struct { diff --git a/packetbeat/protos/icmp/fields.go b/packetbeat/protos/icmp/fields.go index 7d01789a7be2..a2feb6509e2a 100644 --- a/packetbeat/protos/icmp/fields.go +++ b/packetbeat/protos/icmp/fields.go @@ -20,7 +20,7 @@ package icmp import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/icmp/icmp.go b/packetbeat/protos/icmp/icmp.go index 82b8481df923..3c4b692ca828 100644 --- a/packetbeat/protos/icmp/icmp.go +++ b/packetbeat/protos/icmp/icmp.go @@ -21,14 +21,14 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket/layers" ) diff --git a/packetbeat/protos/icmp/icmp_test.go b/packetbeat/protos/icmp/icmp_test.go index 0a8e7750b353..3ad537fa7d4a 100644 --- a/packetbeat/protos/icmp/icmp_test.go +++ b/packetbeat/protos/icmp/icmp_test.go @@ -24,11 +24,11 @@ import ( "net" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/protos/icmp/message.go b/packetbeat/protos/icmp/message.go index 0a8b857c2df8..873809a212a9 100644 --- a/packetbeat/protos/icmp/message.go +++ b/packetbeat/protos/icmp/message.go @@ -23,7 +23,7 @@ import ( "github.com/tsg/gopacket/layers" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TODO: more types (that are not provided as constants in gopacket) diff --git a/packetbeat/protos/memcache/binary.go b/packetbeat/protos/memcache/binary.go index 0ec929995e36..f9db915ce8a9 100644 --- a/packetbeat/protos/memcache/binary.go +++ b/packetbeat/protos/memcache/binary.go @@ -24,8 +24,8 @@ package memcache // init function. import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type memcacheMagic uint8 diff --git a/packetbeat/protos/memcache/commands.go b/packetbeat/protos/memcache/commands.go index 8afe3ca1795f..399647bac5a9 100644 --- a/packetbeat/protos/memcache/commands.go +++ b/packetbeat/protos/memcache/commands.go @@ -21,8 +21,8 @@ package memcache // binary/text protocol based commands with setters and serializers. import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type commandType struct { diff --git a/packetbeat/protos/memcache/config.go b/packetbeat/protos/memcache/config.go index cc0863fbe690..e558c84153dd 100644 --- a/packetbeat/protos/memcache/config.go +++ b/packetbeat/protos/memcache/config.go @@ -20,8 +20,8 @@ package memcache import ( "time" - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type memcacheConfig struct { diff --git a/packetbeat/protos/memcache/fields.go b/packetbeat/protos/memcache/fields.go index 8e886384959a..a346cddbd4f8 100644 --- a/packetbeat/protos/memcache/fields.go +++ b/packetbeat/protos/memcache/fields.go @@ -20,7 +20,7 @@ package memcache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/memcache/memcache.go b/packetbeat/protos/memcache/memcache.go index 96676a4a7f18..74bbd0f3f89c 100644 --- a/packetbeat/protos/memcache/memcache.go +++ b/packetbeat/protos/memcache/memcache.go @@ -24,13 +24,13 @@ import ( "math" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) // memcache types diff --git a/packetbeat/protos/memcache/memcache_test.go b/packetbeat/protos/memcache/memcache_test.go index 63cfadc463e3..7e6f61cd67e0 100644 --- a/packetbeat/protos/memcache/memcache_test.go +++ b/packetbeat/protos/memcache/memcache_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type memcacheTest struct { diff --git a/packetbeat/protos/memcache/parse.go b/packetbeat/protos/memcache/parse.go index 64e1486a70df..2fe774c19e5c 100644 --- a/packetbeat/protos/memcache/parse.go +++ b/packetbeat/protos/memcache/parse.go @@ -22,7 +22,7 @@ package memcache import ( "time" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) const ( diff --git a/packetbeat/protos/memcache/parse_test.go b/packetbeat/protos/memcache/parse_test.go index c61e7875cffd..f50b156a789c 100644 --- a/packetbeat/protos/memcache/parse_test.go +++ b/packetbeat/protos/memcache/parse_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type testParser struct { diff --git a/packetbeat/protos/memcache/plugin_tcp.go b/packetbeat/protos/memcache/plugin_tcp.go index ff9f15f266b7..e9dded17dd65 100644 --- a/packetbeat/protos/memcache/plugin_tcp.go +++ b/packetbeat/protos/memcache/plugin_tcp.go @@ -22,13 +22,13 @@ package memcache import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type tcpMemcache struct { diff --git a/packetbeat/protos/memcache/plugin_udp.go b/packetbeat/protos/memcache/plugin_udp.go index e0041ccf83f1..850c6e421fb2 100644 --- a/packetbeat/protos/memcache/plugin_udp.go +++ b/packetbeat/protos/memcache/plugin_udp.go @@ -23,13 +23,13 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type udpMemcache struct { diff --git a/packetbeat/protos/memcache/text.go b/packetbeat/protos/memcache/text.go index 769ccbf08e98..72b36442c9a5 100644 --- a/packetbeat/protos/memcache/text.go +++ b/packetbeat/protos/memcache/text.go @@ -29,8 +29,8 @@ import ( "bytes" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type textCommandType struct { diff --git a/packetbeat/protos/mongodb/config.go b/packetbeat/protos/mongodb/config.go index 76e1fc998c18..e7e2143b6474 100644 --- a/packetbeat/protos/mongodb/config.go +++ b/packetbeat/protos/mongodb/config.go @@ -18,8 +18,8 @@ package mongodb import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type mongodbConfig struct { diff --git a/packetbeat/protos/mongodb/fields.go b/packetbeat/protos/mongodb/fields.go index 4a84b24f29fb..5293efdece9a 100644 --- a/packetbeat/protos/mongodb/fields.go +++ b/packetbeat/protos/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mongodb/mongodb.go b/packetbeat/protos/mongodb/mongodb.go index c3690944325f..ac3e66dca5ee 100644 --- a/packetbeat/protos/mongodb/mongodb.go +++ b/packetbeat/protos/mongodb/mongodb.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) var debugf = logp.MakeDebug("mongodb") diff --git a/packetbeat/protos/mongodb/mongodb_parser.go b/packetbeat/protos/mongodb/mongodb_parser.go index cbbeca800ebb..a5ff5fa06253 100644 --- a/packetbeat/protos/mongodb/mongodb_parser.go +++ b/packetbeat/protos/mongodb/mongodb_parser.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "gopkg.in/mgo.v2/bson" ) diff --git a/packetbeat/protos/mongodb/mongodb_structs.go b/packetbeat/protos/mongodb/mongodb_structs.go index b3366f0b97bb..6bd66b4570f8 100644 --- a/packetbeat/protos/mongodb/mongodb_structs.go +++ b/packetbeat/protos/mongodb/mongodb_structs.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type mongodbMessage struct { diff --git a/packetbeat/protos/mongodb/mongodb_test.go b/packetbeat/protos/mongodb/mongodb_test.go index 09cc2a1ef4f9..4bd16ec121d0 100644 --- a/packetbeat/protos/mongodb/mongodb_test.go +++ b/packetbeat/protos/mongodb/mongodb_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" ) type eventStore struct { diff --git a/packetbeat/protos/mysql/config.go b/packetbeat/protos/mysql/config.go index 4429946f7f34..d53429c3a2cd 100644 --- a/packetbeat/protos/mysql/config.go +++ b/packetbeat/protos/mysql/config.go @@ -20,8 +20,8 @@ package mysql import ( "time" - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type mysqlConfig struct { diff --git a/packetbeat/protos/mysql/fields.go b/packetbeat/protos/mysql/fields.go index 609b5d029623..05c415aebd8a 100644 --- a/packetbeat/protos/mysql/fields.go +++ b/packetbeat/protos/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mysql/mysql.go b/packetbeat/protos/mysql/mysql.go index 1e6fc5179def..4d08debf9767 100644 --- a/packetbeat/protos/mysql/mysql.go +++ b/packetbeat/protos/mysql/mysql.go @@ -25,14 +25,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) // Packet types diff --git a/packetbeat/protos/mysql/mysql_test.go b/packetbeat/protos/mysql/mysql_test.go index 20332a08cc1a..9bdfdb2cf072 100644 --- a/packetbeat/protos/mysql/mysql_test.go +++ b/packetbeat/protos/mysql/mysql_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/publish" ) const serverPort = 3306 diff --git a/packetbeat/protos/nfs/config.go b/packetbeat/protos/nfs/config.go index 70f9cef0a0e6..639bdad525d6 100644 --- a/packetbeat/protos/nfs/config.go +++ b/packetbeat/protos/nfs/config.go @@ -20,7 +20,7 @@ package nfs import ( "time" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) type rpcConfig struct { diff --git a/packetbeat/protos/nfs/fields.go b/packetbeat/protos/nfs/fields.go index d195b065d791..7ebf9023bbc8 100644 --- a/packetbeat/protos/nfs/fields.go +++ b/packetbeat/protos/nfs/fields.go @@ -20,7 +20,7 @@ package nfs import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/nfs/nfs.go b/packetbeat/protos/nfs/nfs.go index cb207cf8f9d3..9537f9924ec3 100644 --- a/packetbeat/protos/nfs/nfs.go +++ b/packetbeat/protos/nfs/nfs.go @@ -18,9 +18,9 @@ package nfs import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/pb" ) type nfs struct { diff --git a/packetbeat/protos/nfs/request_handler.go b/packetbeat/protos/nfs/request_handler.go index bd56466197d1..241e0dca482c 100644 --- a/packetbeat/protos/nfs/request_handler.go +++ b/packetbeat/protos/nfs/request_handler.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) const nfsProgramNumber = 100003 diff --git a/packetbeat/protos/nfs/rpc.go b/packetbeat/protos/nfs/rpc.go index 7607bb507b85..f115cf19fba0 100644 --- a/packetbeat/protos/nfs/rpc.go +++ b/packetbeat/protos/nfs/rpc.go @@ -26,11 +26,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) var debugf = logp.MakeDebug("rpc") diff --git a/packetbeat/protos/pgsql/config.go b/packetbeat/protos/pgsql/config.go index 4a647483f4fa..54a9a1b9e2eb 100644 --- a/packetbeat/protos/pgsql/config.go +++ b/packetbeat/protos/pgsql/config.go @@ -18,8 +18,8 @@ package pgsql import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type pgsqlConfig struct { diff --git a/packetbeat/protos/pgsql/fields.go b/packetbeat/protos/pgsql/fields.go index f01c41c8bd51..9e6dd8c6a8ad 100644 --- a/packetbeat/protos/pgsql/fields.go +++ b/packetbeat/protos/pgsql/fields.go @@ -20,7 +20,7 @@ package pgsql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/pgsql/parse.go b/packetbeat/protos/pgsql/parse.go index cf7d9f72d97e..a7bcdb44770a 100644 --- a/packetbeat/protos/pgsql/parse.go +++ b/packetbeat/protos/pgsql/parse.go @@ -21,7 +21,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/packetbeat/protos/pgsql/pgsql.go b/packetbeat/protos/pgsql/pgsql.go index a16c07d64b9a..69bfb4688879 100644 --- a/packetbeat/protos/pgsql/pgsql.go +++ b/packetbeat/protos/pgsql/pgsql.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" "go.uber.org/zap" ) diff --git a/packetbeat/protos/pgsql/pgsql_test.go b/packetbeat/protos/pgsql/pgsql_test.go index 259f727adc43..356d367c3911 100644 --- a/packetbeat/protos/pgsql/pgsql_test.go +++ b/packetbeat/protos/pgsql/pgsql_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/protos.go b/packetbeat/protos/protos.go index fe801f96c616..9991458eb2b8 100644 --- a/packetbeat/protos/protos.go +++ b/packetbeat/protos/protos.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/packetbeat/protos/protos_test.go b/packetbeat/protos/protos_test.go index 2d482d7179b0..4d61d20038e0 100644 --- a/packetbeat/protos/protos_test.go +++ b/packetbeat/protos/protos_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/redis/config.go b/packetbeat/protos/redis/config.go index 0450923ca898..beb1caed2e2f 100644 --- a/packetbeat/protos/redis/config.go +++ b/packetbeat/protos/redis/config.go @@ -18,8 +18,8 @@ package redis import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type redisConfig struct { diff --git a/packetbeat/protos/redis/fields.go b/packetbeat/protos/redis/fields.go index 7e816a6ac811..6c6bb66c0e3e 100644 --- a/packetbeat/protos/redis/fields.go +++ b/packetbeat/protos/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/redis/redis.go b/packetbeat/protos/redis/redis.go index 3962c199a8e8..e7feac645c53 100644 --- a/packetbeat/protos/redis/redis.go +++ b/packetbeat/protos/redis/redis.go @@ -21,16 +21,16 @@ import ( "bytes" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type stream struct { diff --git a/packetbeat/protos/redis/redis_parse.go b/packetbeat/protos/redis/redis_parse.go index 5ec9c3a7c286..c99679a1ba6f 100644 --- a/packetbeat/protos/redis/redis_parse.go +++ b/packetbeat/protos/redis/redis_parse.go @@ -20,9 +20,9 @@ package redis import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) type parser struct { diff --git a/packetbeat/protos/registry.go b/packetbeat/protos/registry.go index c8b5ad56517a..f1fc17b70740 100644 --- a/packetbeat/protos/registry.go +++ b/packetbeat/protos/registry.go @@ -20,8 +20,8 @@ package protos import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type ProtocolPlugin func( diff --git a/packetbeat/protos/tcp/tcp.go b/packetbeat/protos/tcp/tcp.go index 215b0cd0d80b..e9db7b948972 100644 --- a/packetbeat/protos/tcp/tcp.go +++ b/packetbeat/protos/tcp/tcp.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket/layers" ) diff --git a/packetbeat/protos/tcp/tcp_test.go b/packetbeat/protos/tcp/tcp_test.go index 879921022300..c34611729376 100644 --- a/packetbeat/protos/tcp/tcp_test.go +++ b/packetbeat/protos/tcp/tcp_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/protos/thrift/config.go b/packetbeat/protos/thrift/config.go index 4f770fa79ee0..f687da9ac0c1 100644 --- a/packetbeat/protos/thrift/config.go +++ b/packetbeat/protos/thrift/config.go @@ -18,8 +18,8 @@ package thrift import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type thriftConfig struct { diff --git a/packetbeat/protos/thrift/fields.go b/packetbeat/protos/thrift/fields.go index 3fdd330f1887..29347f3b1f31 100644 --- a/packetbeat/protos/thrift/fields.go +++ b/packetbeat/protos/thrift/fields.go @@ -20,7 +20,7 @@ package thrift import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/thrift/thrift.go b/packetbeat/protos/thrift/thrift.go index 8241f4001084..8c15b9bdf9c6 100644 --- a/packetbeat/protos/thrift/thrift.go +++ b/packetbeat/protos/thrift/thrift.go @@ -27,14 +27,14 @@ import ( "time" "unicode/utf8" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type thriftPlugin struct { diff --git a/packetbeat/protos/thrift/thrift_idl.go b/packetbeat/protos/thrift/thrift_idl.go index 8d4d891bc86e..82d8dedbe939 100644 --- a/packetbeat/protos/thrift/thrift_idl.go +++ b/packetbeat/protos/thrift/thrift_idl.go @@ -20,7 +20,7 @@ package thrift import ( "fmt" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/samuel/go-thrift/parser" ) diff --git a/packetbeat/protos/thrift/thrift_idl_test.go b/packetbeat/protos/thrift/thrift_idl_test.go index 3120abe9ef0c..e1d5a334b87a 100644 --- a/packetbeat/protos/thrift/thrift_idl_test.go +++ b/packetbeat/protos/thrift/thrift_idl_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func thriftIdlForTesting(t *testing.T, content string) *thriftIdl { diff --git a/packetbeat/protos/thrift/thrift_test.go b/packetbeat/protos/thrift/thrift_test.go index 58cf9a26f24f..2c6618bab770 100644 --- a/packetbeat/protos/thrift/thrift_test.go +++ b/packetbeat/protos/thrift/thrift_test.go @@ -24,9 +24,9 @@ import ( "net" "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" ) func thriftForTests() *thriftPlugin { diff --git a/packetbeat/protos/tls/alerts.go b/packetbeat/protos/tls/alerts.go index 1ff6cbb8cc05..4713e7e81f60 100644 --- a/packetbeat/protos/tls/alerts.go +++ b/packetbeat/protos/tls/alerts.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type alertSeverity uint8 diff --git a/packetbeat/protos/tls/alerts_test.go b/packetbeat/protos/tls/alerts_test.go index 5a33704eb66d..5c35d3bbf28d 100644 --- a/packetbeat/protos/tls/alerts_test.go +++ b/packetbeat/protos/tls/alerts_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) func getParser() *parser { diff --git a/packetbeat/protos/tls/buffer.go b/packetbeat/protos/tls/buffer.go index 30864f803123..55205fd6fd41 100644 --- a/packetbeat/protos/tls/buffer.go +++ b/packetbeat/protos/tls/buffer.go @@ -20,7 +20,7 @@ package tls import ( "fmt" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type bufferView struct { diff --git a/packetbeat/protos/tls/config.go b/packetbeat/protos/tls/config.go index 5f35d4e54362..775a8f69cc10 100644 --- a/packetbeat/protos/tls/config.go +++ b/packetbeat/protos/tls/config.go @@ -18,8 +18,8 @@ package tls import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type tlsConfig struct { diff --git a/packetbeat/protos/tls/extensions.go b/packetbeat/protos/tls/extensions.go index 50a5ddf23b2b..0021705c7f7f 100644 --- a/packetbeat/protos/tls/extensions.go +++ b/packetbeat/protos/tls/extensions.go @@ -21,8 +21,8 @@ import ( "fmt" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // ExtensionID is the 16-bit identifier for an extension diff --git a/packetbeat/protos/tls/fields.go b/packetbeat/protos/tls/fields.go index 980f6b3a403a..c4e3b2743486 100644 --- a/packetbeat/protos/tls/fields.go +++ b/packetbeat/protos/tls/fields.go @@ -20,7 +20,7 @@ package tls import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/tls/ja3_test.go b/packetbeat/protos/tls/ja3_test.go index c8f58333063d..b71ef35f4654 100644 --- a/packetbeat/protos/tls/ja3_test.go +++ b/packetbeat/protos/tls/ja3_test.go @@ -23,7 +23,7 @@ import ( "encoding/hex" "testing" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/tls/parse.go b/packetbeat/protos/tls/parse.go index 2191a7a8afde..d6714a76784a 100644 --- a/packetbeat/protos/tls/parse.go +++ b/packetbeat/protos/tls/parse.go @@ -27,9 +27,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) type direction uint8 diff --git a/packetbeat/protos/tls/parse_test.go b/packetbeat/protos/tls/parse_test.go index aaad54f30bf0..f8635371494d 100644 --- a/packetbeat/protos/tls/parse_test.go +++ b/packetbeat/protos/tls/parse_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/packetbeat/protos/tls/tls.go b/packetbeat/protos/tls/tls.go index b8b5431f1ee8..ab068884b615 100644 --- a/packetbeat/protos/tls/tls.go +++ b/packetbeat/protos/tls/tls.go @@ -24,15 +24,15 @@ import ( "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/x509util" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/x509util" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type stream struct { diff --git a/packetbeat/protos/tls/tls_test.go b/packetbeat/protos/tls/tls_test.go index 0fc9cc501e4a..608e87738837 100644 --- a/packetbeat/protos/tls/tls_test.go +++ b/packetbeat/protos/tls/tls_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/udp/udp.go b/packetbeat/protos/udp/udp.go index 8e05691d95c3..1d26fbf0c877 100644 --- a/packetbeat/protos/udp/udp.go +++ b/packetbeat/protos/udp/udp.go @@ -20,11 +20,11 @@ package udp import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" ) type UDP struct { diff --git a/packetbeat/protos/udp/udp_test.go b/packetbeat/protos/udp/udp_test.go index 32b4503945a4..32eae60308ac 100644 --- a/packetbeat/protos/udp/udp_test.go +++ b/packetbeat/protos/udp/udp_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" // import plugins for testing - _ "github.com/elastic/beats/packetbeat/protos/http" - _ "github.com/elastic/beats/packetbeat/protos/mysql" - _ "github.com/elastic/beats/packetbeat/protos/redis" + _ "github.com/elastic/beats/v7/packetbeat/protos/http" + _ "github.com/elastic/beats/v7/packetbeat/protos/mysql" + _ "github.com/elastic/beats/v7/packetbeat/protos/redis" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/publish/publish.go b/packetbeat/publish/publish.go index 844f6d4e9b07..7890a1c173d9 100644 --- a/packetbeat/publish/publish.go +++ b/packetbeat/publish/publish.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/packetbeat/pb" ) type TransactionPublisher struct { diff --git a/packetbeat/publish/publish_test.go b/packetbeat/publish/publish_test.go index 895d8247bdab..711758187b0c 100644 --- a/packetbeat/publish/publish_test.go +++ b/packetbeat/publish/publish_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/pb" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/scripts/mage/config.go b/packetbeat/scripts/mage/config.go index d1b695e97b33..fac457cd7efd 100644 --- a/packetbeat/scripts/mage/config.go +++ b/packetbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/packetbeat/scripts/tcp-protocol/README.md b/packetbeat/scripts/tcp-protocol/README.md index 28c7c679b30e..b593a182237f 100644 --- a/packetbeat/scripts/tcp-protocol/README.md +++ b/packetbeat/scripts/tcp-protocol/README.md @@ -107,7 +107,7 @@ Create analyzer skeleton from code generator template. ``` Load plugin into packetbeat by running `make update`. Or add `_ -"github.com/elastic/beats/packetbeat/protos/echo"` to the import list in +"github.com/elastic/beats/v7/packetbeat/protos/echo"` to the import list in `$GOPATH/src/github.com/elastic/beats/packetbeat/include/list.go`. ### 2.2 Standalone beat with protocol analyzer (echo): @@ -132,8 +132,8 @@ package main import ( "os" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/packetbeat/beater" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/packetbeat/beater" // import supported protocol modules _ "github.com/urso/pb_echo/protos/echo" diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl index 4e8ff9702841..66ca38c28360 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl @@ -1,8 +1,8 @@ package {protocol} import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type {protocol}Config struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl index dc114289482a..00c64cf15dc3 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type parser struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl index a6cdb7ff73e9..cf69faac9c90 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl @@ -1,10 +1,10 @@ package {protocol} import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Transaction Publisher. diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl index e234d01ceb66..4f7ad362bfed 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl @@ -3,10 +3,10 @@ package {protocol} import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type transactions struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl index 98f5758283d9..f783e8403018 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl @@ -3,11 +3,11 @@ package {protocol} import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) // {plugin_type} application level protocol analyzer plugin diff --git a/packetbeat/sniffer/afpacket_linux.go b/packetbeat/sniffer/afpacket_linux.go index 005254a4ff4c..c95e7a377975 100644 --- a/packetbeat/sniffer/afpacket_linux.go +++ b/packetbeat/sniffer/afpacket_linux.go @@ -25,7 +25,7 @@ import ( "time" "unsafe" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/tsg/gopacket" "github.com/tsg/gopacket/afpacket" diff --git a/packetbeat/sniffer/device.go b/packetbeat/sniffer/device.go index 29fc4cbe69cb..52ff220309dc 100644 --- a/packetbeat/sniffer/device.go +++ b/packetbeat/sniffer/device.go @@ -24,7 +24,7 @@ import ( "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var deviceAnySupported = runtime.GOOS == "linux" diff --git a/packetbeat/sniffer/file.go b/packetbeat/sniffer/file.go index 1d6913b92b13..b112e4c90edb 100644 --- a/packetbeat/sniffer/file.go +++ b/packetbeat/sniffer/file.go @@ -26,7 +26,7 @@ import ( "github.com/tsg/gopacket/layers" "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type fileHandler struct { diff --git a/packetbeat/sniffer/sniffer.go b/packetbeat/sniffer/sniffer.go index d38101c4b20a..bfe720c7b985 100644 --- a/packetbeat/sniffer/sniffer.go +++ b/packetbeat/sniffer/sniffer.go @@ -29,10 +29,10 @@ import ( "github.com/tsg/gopacket/layers" "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) // Sniffer provides packet sniffing capabilities, forwarding packets read diff --git a/script/clean_vendor.sh b/script/clean_vendor.sh deleted file mode 100755 index e03e8083e84b..000000000000 --- a/script/clean_vendor.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -# Removes unnecessary files from the vendor directories -# -# A list for files to be removed is used instead of excluding files. -# The reason is that this makes the setup simpler and prevents -# from removing files by accident -# -# In general it should always be checked manually which files were removed. -# For example some projects like stretchr/testify have two LICENSE files -# with different names, where it is ok that one is removed. -# -# We keep the CHANGELOG in as this makes it easy visible when updating dependencies -# on what has changed. - -# In general the following files should be kept: -# * .go -# * LICENSE* CHANGELOG*, PATENT*, CONTRIBUTORS*, README* -# * `.s`, `.c`, `.cpp`, `.cc`, `.c++` -# * `.m`, `.mm`, `.m++` - -# Finds all vendor directories -DIR_LIST=`find . -type d -name vendor` - -# Remove directories used for versioning -find $DIR_LIST -type d -name ".bzr" -o -name ".git" -exec rm -rf {} \; - -## Removing all yaml files which are normally config files (travis.yml) -find $DIR_LIST -type f -name "*.yml" -exec rm -r {} \; - -## Removing all golang test files -find $DIR_LIST -type f -name "*_test.go" -exec rm -r {} \; - -## Removing all files starting with a dot (like .gitignore) -find $DIR_LIST -type f -name ".*" -exec rm -r {} \; - -## Removing all .txt files which are normally test data or docs -## Excluding files mentioned above as e.x. nranchev/go-libGeoIP has the license in a .txt file -find $DIR_LIST -type f -name "*.txt" -a ! \( -iname "LICENSE.*" -o -iname "CHANGELOG.*" -o -iname "PATENT.*" -o -iname "CONTRIBUTORS.*" -o -iname "README.*" \) -exec rm -r {} \; - -## Removing all *.cfg files -find $DIR_LIST -type f -name "*.cfg" -exec rm -r {} \; - -## Removing all *.bat files -find $DIR_LIST -type f -name "*.bat" -exec rm -r {} \; - -## Removing all *.tar files -find $DIR_LIST -type f -name "*.tar" -exec rm -r {} \; diff --git a/script/update_golang_x.py b/script/update_golang_x.py deleted file mode 100644 index 3d9cdee7f07f..000000000000 --- a/script/update_golang_x.py +++ /dev/null @@ -1,39 +0,0 @@ -import json -import os -import argparse -import subprocess - - -def update(pkg_name): - """Call govendor on the targeted golang/x packages""" - - vendor_file = os.path.join('vendor', 'vendor.json') - target = 'golang.org/x/{}'.format(pkg_name) - - with open(vendor_file) as content: - deps = json.load(content) - packages = [dep['path'] for dep in deps['package'] if dep['path'].startswith(target)] - revision = '@{revision}'.format(revision=args.revision) if args.revision else '' - packages = ['{pkg}{revision}'.format(pkg=pkg, revision=revision) for pkg in packages] - cmd = ['govendor', 'fetch'] + packages - if args.verbose: - print(' '.join(cmd)) - subprocess.check_call(cmd) - - -def get_parser(): - """Creates parser to parse script params - """ - parser = argparse.ArgumentParser(description="Update golang.org/x/ in vendor folder") - parser.add_argument('-q', '--quiet', dest='verbose', action='store_false', help='work quietly') - parser.add_argument('--revision', help='update deps to this revision', default='') - parser.add_argument('name', help='name of the golang.org/x/ package. Can be empty', default='', nargs='?') - return parser - - -if __name__ == "__main__": - - parser = get_parser() - args = parser.parse_args() - - update(args.name) diff --git a/tools/tools.go b/tools/tools.go new file mode 100644 index 000000000000..8e2135946d85 --- /dev/null +++ b/tools/tools.go @@ -0,0 +1,37 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build tools + +// This package contains the tool dependencies of the project. + +package tools + +import ( + _ "github.com/magefile/mage" + _ "github.com/pierrre/gotestcover" + _ "github.com/stretchr/testify/assert" + _ "github.com/tsg/go-daemon" + _ "golang.org/x/tools/cmd/goimports" + _ "golang.org/x/tools/cmd/stringer" + + _ "github.com/mitchellh/gox" + _ "github.com/reviewdog/reviewdog/cmd/reviewdog" + _ "golang.org/x/lint/golint" + + _ "github.com/elastic/go-licenser" +) diff --git a/vendor/4d63.com/embedfiles/LICENSE b/vendor/4d63.com/embedfiles/LICENSE new file mode 100644 index 000000000000..3ce2f074404d --- /dev/null +++ b/vendor/4d63.com/embedfiles/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2017, Leigh McCulloch + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/4d63.com/embedfiles/README.md b/vendor/4d63.com/embedfiles/README.md new file mode 100644 index 000000000000..1c08e21ce417 --- /dev/null +++ b/vendor/4d63.com/embedfiles/README.md @@ -0,0 +1,69 @@ +# embedfiles +[![Go Report Card](https://goreportcard.com/badge/github.com/leighmcculloch/embedfiles)](https://goreportcard.com/report/github.com/leighmcculloch/embedfiles) + +Embedfiles is a tool for embedding files into Go code. + +Files are stored in a map of filenames to file data. + +## Install + +### Source + +``` +go get 4d63.com/embedfiles +``` + +## Usage + +``` +$ embedfiles +Embedfiles embeds files into a map in a go file. + +Usage: + + embedfiles -out=files.go -pkg=main + +Flags: + + -out file + output go file (default "files.go") + -pkg package + package name of the go file (default "main") +``` + +## Example + +Given files: +``` +$ echo "hello world" > file1 +$ mkdir morefiles +$ echo "who are you?" > morefiles/file2 +``` + +Embed with `embedfiles`: +``` +$ embedfiles file1 morefiles +``` + +A new file `files.go` is created: +``` +$ cat files.go +// Generated by 4d63.com/embedfiles. + +package main + +var fileNames = []string{ + "file1", "morefiles/file2", +} + +var files = map[string][]byte{ + + "file1": []byte{ + 31, 139, 8, 0, 0, 0, 0, 0, 2, 255, 202, 72, 205, 201, 201, 87, 40, 207, 47, 202, 73, 225, 2, 4, 0, 0, 255, 255, 45, 59, 8, 175, 12, 0, 0, 0, + }, + + "morefiles/file2": []byte{ + 31, 139, 8, 0, 0, 0, 0, 0, 2, 255, 42, 207, 200, 87, 72, 44, 74, 85, 168, 204, 47, 181, 231, 2, 4, 0, 0, 255, 255, 138, 46, 37, 108, 13, 0, 0, 0, + }, +} +``` diff --git a/vendor/4d63.com/embedfiles/main.go b/vendor/4d63.com/embedfiles/main.go new file mode 100644 index 000000000000..2df56b7de5f2 --- /dev/null +++ b/vendor/4d63.com/embedfiles/main.go @@ -0,0 +1,121 @@ +package main // import "4d63.com/embedfiles" + +import ( + "bytes" + "flag" + "fmt" + "go/format" + "io/ioutil" + "os" + "path/filepath" + "text/template" +) + +const tmpl = ` +// Generated by 4d63.com/embedfiles. + +package {{.Package}} + +var fileNames = []string{ {{range $name, $bytes := .Files}}"{{$name}}",{{end}} } + +var files = map[string][]byte{ +{{range $name, $bytes := .Files}} + "{{$name}}": []byte{ {{range $bytes}}{{.}},{{end}} }, +{{end}} +} +` + +type tmplData struct { + Package string + Files map[string][]byte +} + +func main() { + out := flag.String("out", "files.go", "output go `file`") + pkg := flag.String("pkg", "main", "`package` name of the go file") + verbose := flag.Bool("verbose", false, "") + flag.Usage = func() { + fmt.Fprintf(os.Stderr, "Embedfiles embeds files in the paths into a map in a go file.\n\n") + fmt.Fprintf(os.Stderr, "Usage:\n\n") + fmt.Fprintf(os.Stderr, " embedfiles -out=files.go -pkg=main \n\n") + fmt.Fprintf(os.Stderr, "Flags:\n\n") + flag.PrintDefaults() + } + flag.Parse() + + inputPaths := flag.Args() + + if len(inputPaths) == 0 { + flag.Usage() + return + } + + f, err := os.Create(*out) + if err != nil { + printErr("creating file", err) + return + } + + files := map[string][]byte{} + for _, inputPath := range inputPaths { + err = filepath.Walk(inputPath, func(path string, info os.FileInfo, err error) error { + if err != nil { + return fmt.Errorf("walking: %s", err) + } + + if info.IsDir() { + return nil + } + + if *verbose { + fmt.Printf("%s ", path) + } + + contents, err := ioutil.ReadFile(path) + if err != nil { + return fmt.Errorf("reading file: %s", err) + } + if *verbose { + fmt.Printf("(%d bytes)\n", len(contents)) + } + + path = filepath.ToSlash(path) + files[path] = contents + return nil + }) + if err != nil { + printErr("walking", err) + return + } + } + + t, err := template.New("").Parse(tmpl) + if err != nil { + printErr("parsing template", err) + return + } + + buf := bytes.Buffer{} + err = t.Execute(&buf, tmplData{Package: *pkg, Files: files}) + if err != nil { + printErr("generating code", err) + return + } + + formatted, err := format.Source(buf.Bytes()) + if err != nil { + printErr("formatting code", err) + return + } + + f.Write(formatted) + err = f.Close() + if err != nil { + printErr("finalizing file", err) + return + } +} + +func printErr(doing string, err error) { + fmt.Fprintf(os.Stderr, "Error %s: %s\n", doing, err) +} diff --git a/vendor/4d63.com/tz/.gitignore b/vendor/4d63.com/tz/.gitignore new file mode 100644 index 000000000000..e7036a00469b --- /dev/null +++ b/vendor/4d63.com/tz/.gitignore @@ -0,0 +1 @@ +zoneinfo/ diff --git a/vendor/4d63.com/tz/tools.go b/vendor/4d63.com/tz/tools.go new file mode 100644 index 000000000000..94669479aac7 --- /dev/null +++ b/vendor/4d63.com/tz/tools.go @@ -0,0 +1,5 @@ +// +build tools + +package tz + +import _ "4d63.com/embedfiles" diff --git a/vendor/cloud.google.com/go/CHANGES.md b/vendor/cloud.google.com/go/CHANGES.md new file mode 100644 index 000000000000..82e0db440c7f --- /dev/null +++ b/vendor/cloud.google.com/go/CHANGES.md @@ -0,0 +1,1419 @@ +# Changes + +## v0.51.0 + +- secretmanager: + - add IAM helper for generic resource IAM handle +- cloudbuild: + - migrate to microgen in a major version +- Various updates to autogenerated clients. + +## v0.50.0 + +- profiler: + - Support disabling CPU profile collection. + - Log when a profile creation attempt begins. +- compute/metadata: + - Fix panic on malformed URLs. + - InstanceName returns actual instance name. +- Various updates to autogenerated clients. + +## v0.49.0 + +- functions/metadata: + - Handle string resources in JSON unmarshaller. +- Various updates to autogenerated clients. + +## v0.48.0 + +- Various updates to autogenerated clients + +## v0.47.0 + +This release drops support for Go 1.9 and Go 1.10: we continue to officially +support Go 1.11, Go 1.12, and Go 1.13. + +- Various updates to autogenerated clients. +- Add cloudbuild/apiv1 client. + +## v0.46.3 + +This is an empty release that was created solely to aid in storage's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.46.2 + +This is an empty release that was created solely to aid in spanner's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.46.1 + +This is an empty release that was created solely to aid in firestore's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.46.0 + +- spanner: + - Retry "Session not found" for read-only transactions. + - Retry aborted PDMLs. +- spanner/spannertest: + - Fix a bug that was causing 0X-prefixed number to be parsed incorrectly. +- storage: + - Add HMACKeyOptions. + - Remove *REGIONAL from StorageClass documentation. Using MULTI_REGIONAL, + DURABLE_REDUCED_AVAILABILITY, and REGIONAL are no longer best practice + StorageClasses but they are still acceptable values. +- trace: + - Remove cloud.google.com/go/trace. Package cloud.google.com/go/trace has been + marked OBSOLETE for several years: it is now no longer provided. If you + relied on this package, please vendor it or switch to using + https://cloud.google.com/trace/docs/setup/go (which obsoleted it). + +## v0.45.1 + +This is an empty release that was created solely to aid in pubsub's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.45.0 + +- compute/metadata: + - Add Email method. +- storage: + - Fix duplicated retry logic. + - Add ReaderObjectAttrs.StartOffset. + - Support reading last N bytes of a file when a negative range is given, such + as `obj.NewRangeReader(ctx, -10, -1)`. + - Add HMACKey listing functionality. +- spanner/spannertest: + - Support primary keys with no columns. + - Fix MinInt64 parsing. + - Implement deletion of key ranges. + - Handle reads during a read-write transaction. + - Handle returning DATE values. +- pubsub: + - Fix Ack/Modack request size calculation. +- logging: + - Add auto-detection of monitored resources on GAE Standard. + +## v0.44.3 + +This is an empty release that was created solely to aid in bigtable's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.44.2 + +This is an empty release that was created solely to aid in bigquery's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.44.1 + +This is an empty release that was created solely to aid in datastore's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.44.0 + +- datastore: + - Interface elements whose underlying types are supported, are now supported. + - Reduce time to initial retry from 1s to 100ms. +- firestore: + - Add Increment transformation. +- storage: + - Allow emulator with STORAGE_EMULATOR_HOST. + - Add methods for HMAC key management. +- pubsub: + - Add PublishCount and PublishLatency measurements. + - Add DefaultPublishViews and DefaultSubscribeViews for convenience of + importing all views. + - Add add Subscription.PushConfig.AuthenticationMethod. +- spanner: + - Allow emulator usage with SPANNER_EMULATOR_HOST. + - Add cloud.google.com/go/spanner/spannertest, a spanner emulator. + - Add cloud.google.com/go/spanner/spansql which contains types and a parser + for the Cloud Spanner SQL dialect. +- asset: + - Add apiv1p2beta1 client. + +## v0.43.0 + +This is an empty release that was created solely to aid in logging's module +carve-out. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. + +## v0.42.0 + +- bigtable: + - Add an admin method to update an instance and clusters. + - Fix bttest regex matching behavior for alternations (things like `|a`). + - Expose BlockAllFilter filter. +- bigquery: + - Add Routines API support. +- storage: + - Add read-only Bucket.LocationType. +- logging: + - Add TraceSampled to Entry. + - Fix to properly extract {Trace, Span}Id from X-Cloud-Trace-Context. +- pubsub: + - Add Cloud Key Management to TopicConfig. + - Change ExpirationPolicy to optional.Duration. +- automl: + - Add apiv1beta1 client. +- iam: + - Fix compilation problem with iam/credentials/apiv1. + +## v0.41.0 + +- bigtable: + - Check results from PredicateFilter in bttest, which fixes certain false matches. +- profiler: + - debugLog checks user defined logging options before logging. +- spanner: + - PartitionedUpdates respect query parameters. + - StartInstance allows specifying cloud API access scopes. +- bigquery: + - Use empty slice instead of nil for ValueSaver, fixing an issue with zero-length, repeated, nested fields causing panics. +- firestore: + - Return same number of snapshots as doc refs (in the form of duplicate records) during GetAll. +- replay: + - Change references to IPv4 addresses to localhost, making replay compatible with IPv6. + +## v0.40.0 + +- all: + - Update to protobuf-golang v1.3.1. +- datastore: + - Attempt to decode GAE-encoded keys if initial decoding attempt fails. + - Support integer time conversion. +- pubsub: + - Add PublishSettings.BundlerByteLimit. If users receive pubsub.ErrOverflow, + this value should be adjusted higher. + - Use IPv6 compatible target in testutil. +- bigtable: + - Fix Latin-1 regexp filters in bttest, allowing \C. + - Expose PassAllFilter. +- profiler: + - Add log messages for slow path in start. + - Fix start to allow retry until success. +- firestore: + - Add admin client. +- containeranalysis: + - Add apiv1 client. +- grafeas: + - Add apiv1 client. + +## 0.39.0 + +- bigtable: + - Implement DeleteInstance in bttest. + - Return an error on invalid ReadRowsRequest.RowRange key ranges in bttest. +- bigquery: + - Move RequirePartitionFilter outside of TimePartioning. + - Expose models API. +- firestore: + - Allow array values in create and update calls. + - Add CollectionGroup method. +- pubsub: + - Add ExpirationPolicy to Subscription. +- storage: + - Add V4 signing. +- rpcreplay: + - Match streams by first sent request. This further improves rpcreplay's + ability to distinguish streams. +- httpreplay: + - Set up Man-In-The-Middle config only once. This should improve proxy + creation when multiple proxies are used in a single process. + - Remove error on empty Content-Type, allowing requests with no Content-Type + header but a non-empty body. +- all: + - Fix an edge case bug in auto-generated library pagination by properly + propagating pagetoken. + +## 0.38.0 + +This update includes a substantial reduction in our transitive dependency list +by way of updating to opencensus@v0.21.0. + +- spanner: + - Error implements GRPCStatus, allowing status.Convert. +- bigtable: + - Fix a bug in bttest that prevents single column queries returning results + that match other filters. + - Remove verbose retry logging. +- logging: + - Ensure RequestUrl has proper UTF-8, removing the need for users to wrap and + rune replace manually. +- recaptchaenterprise: + - Add v1beta1 client. +- phishingprotection: + - Add v1beta1 client. + +## 0.37.4 + +This patch releases re-builds the go.sum. This was not possible in the +previous release. + +- firestore: + - Add sentinel value DetectProjectID for auto-detecting project ID. + - Add OpenCensus tracing for public methods. + - Marked stable. All future changes come with a backwards compatibility + guarantee. + - Removed firestore/apiv1beta1. All users relying on this low-level library + should migrate to firestore/apiv1. Note that most users should use the + high-level firestore package instead. +- pubsub: + - Allow large messages in synchronous pull case. + - Cap bundler byte limit. This should prevent OOM conditions when there are + a very large number of message publishes occurring. +- storage: + - Add ETag to BucketAttrs and ObjectAttrs. +- datastore: + - Removed some non-sensical OpenCensus traces. +- webrisk: + - Add v1 client. +- asset: + - Add v1 client. +- cloudtasks: + - Add v2 client. + +## 0.37.3 + +This patch release removes github.com/golang/lint from the transitive +dependency list, resolving `go get -u` problems. + +Note: this release intentionally has a broken go.sum. Please use v0.37.4. + +## 0.37.2 + +This patch release is mostly intended to bring in v0.3.0 of +google.golang.org/api, which fixes a GCF deployment issue. + +Note: we had to-date accidentally marked Redis as stable. In this release, we've +fixed it by downgrading its documentation to alpha, as it is in other languages +and docs. + +- all: + - Document context in generated libraries. + +## 0.37.1 + +Small go.mod version bumps to bring in v0.2.0 of google.golang.org/api, which +introduces a new oauth2 url. + +## 0.37.0 + +- spanner: + - Add BatchDML method. + - Reduced initial time between retries. +- bigquery: + - Produce better error messages for InferSchema. + - Add logical type control for avro loads. + - Add support for the GEOGRAPHY type. +- datastore: + - Add sentinel value DetectProjectID for auto-detecting project ID. + - Allow flatten tag on struct pointers. + - Fixed a bug that caused queries to panic with invalid queries. Instead they + will now return an error. +- profiler: + - Add ability to override GCE zone and instance. +- pubsub: + - BEHAVIOR CHANGE: Refactor error code retry logic. RPCs should now more + consistently retry specific error codes based on whether they're idempotent + or non-idempotent. +- httpreplay: Fixed a bug when a non-GET request had a zero-length body causing + the Content-Length header to be dropped. +- iot: + - Add new apiv1 client. +- securitycenter: + - Add new apiv1 client. +- cloudscheduler: + - Add new apiv1 client. + +## 0.36.0 + +- spanner: + - Reduce minimum retry backoff from 1s to 100ms. This makes time between + retries much faster and should improve latency. +- storage: + - Add support for Bucket Policy Only. +- kms: + - Add ResourceIAM helper method. + - Deprecate KeyRingIAM and CryptoKeyIAM. Please use ResourceIAM. +- firestore: + - Switch from v1beta1 API to v1 API. + - Allow emulator with FIRESTORE_EMULATOR_HOST. +- bigquery: + - Add NumLongTermBytes to Table. + - Add TotalBytesProcessedAccuracy to QueryStatistics. +- irm: + - Add new v1alpha2 client. +- talent: + - Add new v4beta1 client. +- rpcreplay: + - Fix connection to work with grpc >= 1.17. + - It is now required for an actual gRPC server to be running for Dial to + succeed. + +## 0.35.1 + +- spanner: + - Adds OpenCensus views back to public API. + +## v0.35.0 + +- all: + - Add go.mod and go.sum. + - Switch usage of gax-go to gax-go/v2. +- bigquery: + - Fix bug where time partitioning could not be removed from a table. + - Fix panic that occurred with empty query parameters. +- bttest: + - Fix bug where deleted rows were returned by ReadRows. +- bigtable/emulator: + - Configure max message size to 256 MiB. +- firestore: + - Allow non-transactional queries in transactions. + - Allow StartAt/EndBefore on direct children at any depth. + - QuerySnapshotIterator.Stop may be called in an error state. + - Fix bug the prevented reset of transaction write state in between retries. +- functions/metadata: + - Make Metadata.Resource a pointer. +- logging: + - Make SpanID available in logging.Entry. +- metadata: + - Wrap !200 error code in a typed err. +- profiler: + - Add function to check if function name is within a particular file in the + profile. + - Set parent field in create profile request. + - Return kubernetes client to start cluster, so client can be used to poll + cluster. + - Add function for checking if filename is in profile. +- pubsub: + - Fix bug where messages expired without an initial modack in + synchronous=true mode. + - Receive does not retry ResourceExhausted errors. +- spanner: + - client.Close now cancels existing requests and should be much faster for + large amounts of sessions. + - Correctly allow MinOpened sessions to be spun up. + +## v0.34.0 + +- functions/metadata: + - Switch to using JSON in context. + - Make Resource a value. +- vision: Fix ProductSearch return type. +- datastore: Add an example for how to handle MultiError. + +## v0.33.1 + +- compute: Removes an erroneously added go.mod. +- logging: Populate source location in fromLogEntry. + +## v0.33.0 + +- bttest: + - Add support for apply_label_transformer. +- expr: + - Add expr library. +- firestore: + - Support retrieval of missing documents. +- kms: + - Add IAM methods. +- pubsub: + - Clarify extension documentation. +- scheduler: + - Add v1beta1 client. +- vision: + - Add product search helper. + - Add new product search client. + +## v0.32.0 + +Note: This release is the last to support Go 1.6 and 1.8. + +- bigquery: + - Add support for removing an expiration. + - Ignore NeverExpire in Table.Create. + - Validate table expiration time. +- cbt: + - Add note about not supporting arbitrary bytes. +- datastore: + - Align key checks. +- firestore: + - Return an error when using Start/End without providing values. +- pubsub: + - Add pstest Close method. + - Clarify MaxExtension documentation. +- securitycenter: + - Add v1beta1 client. +- spanner: + - Allow nil in mutations. + - Improve doc of SessionPoolConfig.MaxOpened. + - Increase session deletion timeout from 5s to 15s. + +## v0.31.0 + +- bigtable: + - Group mutations across multiple requests. +- bigquery: + - Link to bigquery troubleshooting errors page in bigquery.Error comment. +- cbt: + - Fix go generate command. + - Document usage of both maxage + maxversions. +- datastore: + - Passing nil keys results in ErrInvalidKey. +- firestore: + - Clarify what Document.DataTo does with untouched struct fields. +- profile: + - Validate service name in agent. +- pubsub: + - Fix deadlock with pstest and ctx.Cancel. + - Fix a possible deadlock in pstest. +- trace: + - Update doc URL with new fragment. + +Special thanks to @fastest963 for going above and beyond helping us to debug +hard-to-reproduce Pub/Sub issues. + +## v0.30.0 + +- spanner: DML support added. See https://godoc.org/cloud.google.com/go/spanner#hdr-DML_and_Partitioned_DML for more information. +- bigtable: bttest supports row sample filter. +- functions: metadata package added for accessing Cloud Functions resource metadata. + +## v0.29.0 + +- bigtable: + - Add retry to all idempotent RPCs. + - cbt supports complex GC policies. + - Emulator supports arbitrary bytes in regex filters. +- firestore: Add ArrayUnion and ArrayRemove. +- logging: Add the ContextFunc option to supply the context used for + asynchronous RPCs. +- profiler: Ignore NotDefinedError when fetching the instance name +- pubsub: + - BEHAVIOR CHANGE: Receive doesn't retry if an RPC returns codes.Cancelled. + - BEHAVIOR CHANGE: Receive retries on Unavailable intead of returning. + - Fix deadlock. + - Restore Ack/Nack/Modacks metrics. + - Improve context handling in iterator. + - Implement synchronous mode for Receive. + - pstest: add Pull. +- spanner: Add a metric for the number of sessions currently opened. +- storage: + - Canceling the context releases all resources. + - Add additional RetentionPolicy attributes. +- vision/apiv1: Add LocalizeObjects method. + +## v0.28.0 + +- bigtable: + - Emulator returns Unimplemented for snapshot RPCs. +- bigquery: + - Support zero-length repeated, nested fields. +- cloud assets: + - Add v1beta client. +- datastore: + - Don't nil out transaction ID on retry. +- firestore: + - BREAKING CHANGE: When watching a query with Query.Snapshots, QuerySnapshotIterator.Next + returns a QuerySnapshot which contains read time, result size, change list and the DocumentIterator + (previously, QuerySnapshotIterator.Next returned just the DocumentIterator). See: https://godoc.org/cloud.google.com/go/firestore#Query.Snapshots. + - Add array-contains operator. +- IAM: + - Add iam/credentials/apiv1 client. +- pubsub: + - Canceling the context passed to Subscription.Receive causes Receive to return when + processing finishes on all messages currently in progress, even if new messages are arriving. +- redis: + - Add redis/apiv1 client. +- storage: + - Add Reader.Attrs. + - Deprecate several Reader getter methods: please use Reader.Attrs for these instead. + - Add ObjectHandle.Bucket and ObjectHandle.Object methods. + +## v0.27.0 + +- bigquery: + - Allow modification of encryption configuration and partitioning options to a table via the Update call. + - Add a SchemaFromJSON function that converts a JSON table schema. +- bigtable: + - Restore cbt count functionality. +- containeranalysis: + - Add v1beta client. +- spanner: + - Fix a case where an iterator might not be closed correctly. +- storage: + - Add ServiceAccount method https://godoc.org/cloud.google.com/go/storage#Client.ServiceAccount. + - Add a method to Reader that returns the parsed value of the Last-Modified header. + +## v0.26.0 + +- bigquery: + - Support filtering listed jobs by min/max creation time. + - Support data clustering (https://godoc.org/cloud.google.com/go/bigquery#Clustering). + - Include job creator email in Job struct. +- bigtable: + - Add `RowSampleFilter`. + - emulator: BREAKING BEHAVIOR CHANGE: Regexps in row, family, column and value filters + must match the entire target string to succeed. Previously, the emulator was + succeeding on partial matches. + NOTE: As of this release, this change only affects the emulator when run + from this repo (bigtable/cmd/emulator/cbtemulator.go). The version launched + from `gcloud` will be updated in a subsequent `gcloud` release. +- dataproc: Add apiv1beta2 client. +- datastore: Save non-nil pointer fields on omitempty. +- logging: populate Entry.Trace from the HTTP X-Cloud-Trace-Context header. +- logging/logadmin: Support writer_identity and include_children. +- pubsub: + - Support labels on topics and subscriptions. + - Support message storage policy for topics. + - Use the distribution of ack times to determine when to extend ack deadlines. + The only user-visible effect of this change should be that programs that + call only `Subscription.Receive` need no IAM permissions other than `Pub/Sub + Subscriber`. +- storage: + - Support predefined ACLs. + - Support additional ACL fields other than Entity and Role. + - Support bucket websites. + - Support bucket logging. + + +## v0.25.0 + +- Added [Code of Conduct](https://github.com/googleapis/google-cloud-go/blob/master/CODE_OF_CONDUCT.md) +- bigtable: + - cbt: Support a GC policy of "never". +- errorreporting: + - Support User. + - Close now calls Flush. + - Use OnError (previously ignored). + - Pass through the RPC error as-is to OnError. +- httpreplay: A tool for recording and replaying HTTP requests + (for the bigquery and storage clients in this repo). +- kms: v1 client added +- logging: add SourceLocation to Entry. +- storage: improve CRC checking on read. + +## v0.24.0 + +- bigquery: Support for the NUMERIC type. +- bigtable: + - cbt: Optionally specify columns for read/lookup + - Support instance-level administration. +- oslogin: New client for the OS Login API. +- pubsub: + - The package is now stable. There will be no further breaking changes. + - Internal changes to improve Subscription.Receive behavior. +- storage: Support updating bucket lifecycle config. +- spanner: Support struct-typed parameter bindings. +- texttospeech: New client for the Text-to-Speech API. + +## v0.23.0 + +- bigquery: Add DDL stats to query statistics. +- bigtable: + - cbt: Add cells-per-column limit for row lookup. + - cbt: Make it possible to combine read filters. +- dlp: v2beta2 client removed. Use the v2 client instead. +- firestore, spanner: Fix compilation errors due to protobuf changes. + +## v0.22.0 + +- bigtable: + - cbt: Support cells per column limit for row read. + - bttest: Correctly handle empty RowSet. + - Fix ReadModifyWrite operation in emulator. + - Fix API path in GetCluster. + +- bigquery: + - BEHAVIOR CHANGE: Retry on 503 status code. + - Add dataset.DeleteWithContents. + - Add SchemaUpdateOptions for query jobs. + - Add Timeline to QueryStatistics. + - Add more stats to ExplainQueryStage. + - Support Parquet data format. + +- datastore: + - Support omitempty for times. + +- dlp: + - **BREAKING CHANGE:** Remove v1beta1 client. Please migrate to the v2 client, + which is now out of beta. + - Add v2 client. + +- firestore: + - BEHAVIOR CHANGE: Treat set({}, MergeAll) as valid. + +- iam: + - Support JWT signing via SignJwt callopt. + +- profiler: + - BEHAVIOR CHANGE: PollForSerialOutput returns an error when context.Done. + - BEHAVIOR CHANGE: Increase the initial backoff to 1 minute. + - Avoid returning empty serial port output. + +- pubsub: + - BEHAVIOR CHANGE: Don't backoff during next retryable error once stream is healthy. + - BEHAVIOR CHANGE: Don't backoff on EOF. + - pstest: Support Acknowledge and ModifyAckDeadline RPCs. + +- redis: + - Add v1 beta Redis client. + +- spanner: + - Support SessionLabels. + +- speech: + - Add api v1 beta1 client. + +- storage: + - BEHAVIOR CHANGE: Retry reads when retryable error occurs. + - Fix delete of object in requester-pays bucket. + - Support KMS integration. + +## v0.21.0 + +- bigquery: + - Add OpenCensus tracing. + +- firestore: + - **BREAKING CHANGE:** If a document does not exist, return a DocumentSnapshot + whose Exists method returns false. DocumentRef.Get and Transaction.Get + return the non-nil DocumentSnapshot in addition to a NotFound error. + **DocumentRef.GetAll and Transaction.GetAll return a non-nil + DocumentSnapshot instead of nil.** + - Add DocumentIterator.Stop. **Call Stop whenever you are done with a + DocumentIterator.** + - Added Query.Snapshots and DocumentRef.Snapshots, which provide realtime + notification of updates. See https://cloud.google.com/firestore/docs/query-data/listen. + - Canceling an RPC now always returns a grpc.Status with codes.Canceled. + +- spanner: + - Add `CommitTimestamp`, which supports inserting the commit timestamp of a + transaction into a column. + +## v0.20.0 + +- bigquery: Support SchemaUpdateOptions for load jobs. + +- bigtable: + - Add SampleRowKeys. + - cbt: Support union, intersection GCPolicy. + - Retry admin RPCS. + - Add trace spans to retries. + +- datastore: Add OpenCensus tracing. + +- firestore: + - Fix queries involving Null and NaN. + - Allow Timestamp protobuffers for time values. + +- logging: Add a WriteTimeout option. + +- spanner: Support Batch API. + +- storage: Add OpenCensus tracing. + +## v0.19.0 + +- bigquery: + - Support customer-managed encryption keys. + +- bigtable: + - Improved emulator support. + - Support GetCluster. + +- datastore: + - Add general mutations. + - Support pointer struct fields. + - Support transaction options. + +- firestore: + - Add Transaction.GetAll. + - Support document cursors. + +- logging: + - Support concurrent RPCs to the service. + - Support per-entry resources. + +- profiler: + - Add config options to disable heap and thread profiling. + - Read the project ID from $GOOGLE_CLOUD_PROJECT when it's set. + +- pubsub: + - BEHAVIOR CHANGE: Release flow control after ack/nack (instead of after the + callback returns). + - Add SubscriptionInProject. + - Add OpenCensus instrumentation for streaming pull. + +- storage: + - Support CORS. + +## v0.18.0 + +- bigquery: + - Marked stable. + - Schema inference of nullable fields supported. + - Added TimePartitioning to QueryConfig. + +- firestore: Data provided to DocumentRef.Set with a Merge option can contain + Delete sentinels. + +- logging: Clients can accept parent resources other than projects. + +- pubsub: + - pubsub/pstest: A lighweight fake for pubsub. Experimental; feedback welcome. + - Support updating more subscription metadata: AckDeadline, + RetainAckedMessages and RetentionDuration. + +- oslogin/apiv1beta: New client for the Cloud OS Login API. + +- rpcreplay: A package for recording and replaying gRPC traffic. + +- spanner: + - Add a ReadWithOptions that supports a row limit, as well as an index. + - Support query plan and execution statistics. + - Added [OpenCensus](http://opencensus.io) support. + +- storage: Clarify checksum validation for gzipped files (it is not validated + when the file is served uncompressed). + + +## v0.17.0 + +- firestore BREAKING CHANGES: + - Remove UpdateMap and UpdateStruct; rename UpdatePaths to Update. + Change + `docref.UpdateMap(ctx, map[string]interface{}{"a.b", 1})` + to + `docref.Update(ctx, []firestore.Update{{Path: "a.b", Value: 1}})` + + Change + `docref.UpdateStruct(ctx, []string{"Field"}, aStruct)` + to + `docref.Update(ctx, []firestore.Update{{Path: "Field", Value: aStruct.Field}})` + - Rename MergePaths to Merge; require args to be FieldPaths + - A value stored as an integer can be read into a floating-point field, and vice versa. +- bigtable/cmd/cbt: + - Support deleting a column. + - Add regex option for row read. +- spanner: Mark stable. +- storage: + - Add Reader.ContentEncoding method. + - Fix handling of SignedURL headers. +- bigquery: + - If Uploader.Put is called with no rows, it returns nil without making a + call. + - Schema inference supports the "nullable" option in struct tags for + non-required fields. + - TimePartitioning supports "Field". + + +## v0.16.0 + +- Other bigquery changes: + - `JobIterator.Next` returns `*Job`; removed `JobInfo` (BREAKING CHANGE). + - UseStandardSQL is deprecated; set UseLegacySQL to true if you need + Legacy SQL. + - Uploader.Put will generate a random insert ID if you do not provide one. + - Support time partitioning for load jobs. + - Support dry-run queries. + - A `Job` remembers its last retrieved status. + - Support retrieving job configuration. + - Support labels for jobs and tables. + - Support dataset access lists. + - Improve support for external data sources, including data from Bigtable and + Google Sheets, and tables with external data. + - Support updating a table's view configuration. + - Fix uploading civil times with nanoseconds. + +- storage: + - Support PubSub notifications. + - Support Requester Pays buckets. + +- profiler: Support goroutine and mutex profile types. + +## v0.15.0 + +- firestore: beta release. See the + [announcement](https://firebase.googleblog.com/2017/10/introducing-cloud-firestore.html). + +- errorreporting: The existing package has been redesigned. + +- errors: This package has been removed. Use errorreporting. + + +## v0.14.0 + +- bigquery BREAKING CHANGES: + - Standard SQL is the default for queries and views. + - `Table.Create` takes `TableMetadata` as a second argument, instead of + options. + - `Dataset.Create` takes `DatasetMetadata` as a second argument. + - `DatasetMetadata` field `ID` renamed to `FullID` + - `TableMetadata` field `ID` renamed to `FullID` + +- Other bigquery changes: + - The client will append a random suffix to a provided job ID if you set + `AddJobIDSuffix` to true in a job config. + - Listing jobs is supported. + - Better retry logic. + +- vision, language, speech: clients are now stable + +- monitoring: client is now beta + +- profiler: + - Rename InstanceName to Instance, ZoneName to Zone + - Auto-detect service name and version on AppEngine. + +## v0.13.0 + +- bigquery: UseLegacySQL options for CreateTable and QueryConfig. Use these + options to continue using Legacy SQL after the client switches its default + to Standard SQL. + +- bigquery: Support for updating dataset labels. + +- bigquery: Set DatasetIterator.ProjectID to list datasets in a project other + than the client's. DatasetsInProject is no longer needed and is deprecated. + +- bigtable: Fail ListInstances when any zones fail. + +- spanner: support decoding of slices of basic types (e.g. []string, []int64, + etc.) + +- logging/logadmin: UpdateSink no longer creates a sink if it is missing + (actually a change to the underlying service, not the client) + +- profiler: Service and ServiceVersion replace Target in Config. + +## v0.12.0 + +- pubsub: Subscription.Receive now uses streaming pull. + +- pubsub: add Client.TopicInProject to access topics in a different project + than the client. + +- errors: renamed errorreporting. The errors package will be removed shortly. + +- datastore: improved retry behavior. + +- bigquery: support updates to dataset metadata, with etags. + +- bigquery: add etag support to Table.Update (BREAKING: etag argument added). + +- bigquery: generate all job IDs on the client. + +- storage: support bucket lifecycle configurations. + + +## v0.11.0 + +- Clients for spanner, pubsub and video are now in beta. + +- New client for DLP. + +- spanner: performance and testing improvements. + +- storage: requester-pays buckets are supported. + +- storage, profiler, bigtable, bigquery: bug fixes and other minor improvements. + +- pubsub: bug fixes and other minor improvements + +## v0.10.0 + +- pubsub: Subscription.ModifyPushConfig replaced with Subscription.Update. + +- pubsub: Subscription.Receive now runs concurrently for higher throughput. + +- vision: cloud.google.com/go/vision is deprecated. Use +cloud.google.com/go/vision/apiv1 instead. + +- translation: now stable. + +- trace: several changes to the surface. See the link below. + +### Code changes required from v0.9.0 + +- pubsub: Replace + + ``` + sub.ModifyPushConfig(ctx, pubsub.PushConfig{Endpoint: "https://example.com/push"}) + ``` + + with + + ``` + sub.Update(ctx, pubsub.SubscriptionConfigToUpdate{ + PushConfig: &pubsub.PushConfig{Endpoint: "https://example.com/push"}, + }) + ``` + +- trace: traceGRPCServerInterceptor will be provided from *trace.Client. +Given an initialized `*trace.Client` named `tc`, instead of + + ``` + s := grpc.NewServer(grpc.UnaryInterceptor(trace.GRPCServerInterceptor(tc))) + ``` + + write + + ``` + s := grpc.NewServer(grpc.UnaryInterceptor(tc.GRPCServerInterceptor())) + ``` + +- trace trace.GRPCClientInterceptor will also provided from *trace.Client. +Instead of + + ``` + conn, err := grpc.Dial(srv.Addr, grpc.WithUnaryInterceptor(trace.GRPCClientInterceptor())) + ``` + + write + + ``` + conn, err := grpc.Dial(srv.Addr, grpc.WithUnaryInterceptor(tc.GRPCClientInterceptor())) + ``` + +- trace: We removed the deprecated `trace.EnableGRPCTracing`. Use the gRPC +interceptor as a dial option as shown below when initializing Cloud package +clients: + + ``` + c, err := pubsub.NewClient(ctx, "project-id", option.WithGRPCDialOption(grpc.WithUnaryInterceptor(tc.GRPCClientInterceptor()))) + if err != nil { + ... + } + ``` + + +## v0.9.0 + +- Breaking changes to some autogenerated clients. +- rpcreplay package added. + +## v0.8.0 + +- profiler package added. +- storage: + - Retry Objects.Insert call. + - Add ProgressFunc to WRiter. +- pubsub: breaking changes: + - Publish is now asynchronous ([announcement](https://groups.google.com/d/topic/google-api-go-announce/aaqRDIQ3rvU/discussion)). + - Subscription.Pull replaced by Subscription.Receive, which takes a callback ([announcement](https://groups.google.com/d/topic/google-api-go-announce/8pt6oetAdKc/discussion)). + - Message.Done replaced with Message.Ack and Message.Nack. + +## v0.7.0 + +- Release of a client library for Spanner. See +the +[blog +post](https://cloudplatform.googleblog.com/2017/02/introducing-Cloud-Spanner-a-global-database-service-for-mission-critical-applications.html). +Note that although the Spanner service is beta, the Go client library is alpha. + +## v0.6.0 + +- Beta release of BigQuery, DataStore, Logging and Storage. See the +[blog post](https://cloudplatform.googleblog.com/2016/12/announcing-new-google-cloud-client.html). + +- bigquery: + - struct support. Read a row directly into a struct with +`RowIterator.Next`, and upload a row directly from a struct with `Uploader.Put`. +You can also use field tags. See the [package documentation][cloud-bigquery-ref] +for details. + + - The `ValueList` type was removed. It is no longer necessary. Instead of + ```go + var v ValueList + ... it.Next(&v) .. + ``` + use + + ```go + var v []Value + ... it.Next(&v) ... + ``` + + - Previously, repeatedly calling `RowIterator.Next` on the same `[]Value` or + `ValueList` would append to the slice. Now each call resets the size to zero first. + + - Schema inference will infer the SQL type BYTES for a struct field of + type []byte. Previously it inferred STRING. + + - The types `uint`, `uint64` and `uintptr` are no longer supported in schema + inference. BigQuery's integer type is INT64, and those types may hold values + that are not correctly represented in a 64-bit signed integer. + +## v0.5.0 + +- bigquery: + - The SQL types DATE, TIME and DATETIME are now supported. They correspond to + the `Date`, `Time` and `DateTime` types in the new `cloud.google.com/go/civil` + package. + - Support for query parameters. + - Support deleting a dataset. + - Values from INTEGER columns will now be returned as int64, not int. This + will avoid errors arising from large values on 32-bit systems. +- datastore: + - Nested Go structs encoded as Entity values, instead of a +flattened list of the embedded struct's fields. This means that you may now have twice-nested slices, eg. + ```go + type State struct { + Cities []struct{ + Populations []int + } + } + ``` + See [the announcement](https://groups.google.com/forum/#!topic/google-api-go-announce/79jtrdeuJAg) for +more details. + - Contexts no longer hold namespaces; instead you must set a key's namespace + explicitly. Also, key functions have been changed and renamed. + - The WithNamespace function has been removed. To specify a namespace in a Query, use the Query.Namespace method: + ```go + q := datastore.NewQuery("Kind").Namespace("ns") + ``` + - All the fields of Key are exported. That means you can construct any Key with a struct literal: + ```go + k := &Key{Kind: "Kind", ID: 37, Namespace: "ns"} + ``` + - As a result of the above, the Key methods Kind, ID, d.Name, Parent, SetParent and Namespace have been removed. + - `NewIncompleteKey` has been removed, replaced by `IncompleteKey`. Replace + ```go + NewIncompleteKey(ctx, kind, parent) + ``` + with + ```go + IncompleteKey(kind, parent) + ``` + and if you do use namespaces, make sure you set the namespace on the returned key. + - `NewKey` has been removed, replaced by `NameKey` and `IDKey`. Replace + ```go + NewKey(ctx, kind, name, 0, parent) + NewKey(ctx, kind, "", id, parent) + ``` + with + ```go + NameKey(kind, name, parent) + IDKey(kind, id, parent) + ``` + and if you do use namespaces, make sure you set the namespace on the returned key. + - The `Done` variable has been removed. Replace `datastore.Done` with `iterator.Done`, from the package `google.golang.org/api/iterator`. + - The `Client.Close` method will have a return type of error. It will return the result of closing the underlying gRPC connection. + - See [the announcement](https://groups.google.com/forum/#!topic/google-api-go-announce/hqXtM_4Ix-0) for +more details. + +## v0.4.0 + +- bigquery: + -`NewGCSReference` is now a function, not a method on `Client`. + - `Table.LoaderFrom` now accepts a `ReaderSource`, enabling + loading data into a table from a file or any `io.Reader`. + * Client.Table and Client.OpenTable have been removed. + Replace + ```go + client.OpenTable("project", "dataset", "table") + ``` + with + ```go + client.DatasetInProject("project", "dataset").Table("table") + ``` + + * Client.CreateTable has been removed. + Replace + ```go + client.CreateTable(ctx, "project", "dataset", "table") + ``` + with + ```go + client.DatasetInProject("project", "dataset").Table("table").Create(ctx) + ``` + + * Dataset.ListTables have been replaced with Dataset.Tables. + Replace + ```go + tables, err := ds.ListTables(ctx) + ``` + with + ```go + it := ds.Tables(ctx) + for { + table, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: use table. + } + ``` + + * Client.Read has been replaced with Job.Read, Table.Read and Query.Read. + Replace + ```go + it, err := client.Read(ctx, job) + ``` + with + ```go + it, err := job.Read(ctx) + ``` + and similarly for reading from tables or queries. + + * The iterator returned from the Read methods is now named RowIterator. Its + behavior is closer to the other iterators in these libraries. It no longer + supports the Schema method; see the next item. + Replace + ```go + for it.Next(ctx) { + var vals ValueList + if err := it.Get(&vals); err != nil { + // TODO: Handle error. + } + // TODO: use vals. + } + if err := it.Err(); err != nil { + // TODO: Handle error. + } + ``` + with + ``` + for { + var vals ValueList + err := it.Next(&vals) + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: use vals. + } + ``` + Instead of the `RecordsPerRequest(n)` option, write + ```go + it.PageInfo().MaxSize = n + ``` + Instead of the `StartIndex(i)` option, write + ```go + it.StartIndex = i + ``` + + * ValueLoader.Load now takes a Schema in addition to a slice of Values. + Replace + ```go + func (vl *myValueLoader) Load(v []bigquery.Value) + ``` + with + ```go + func (vl *myValueLoader) Load(v []bigquery.Value, s bigquery.Schema) + ``` + + + * Table.Patch is replace by Table.Update. + Replace + ```go + p := table.Patch() + p.Description("new description") + metadata, err := p.Apply(ctx) + ``` + with + ```go + metadata, err := table.Update(ctx, bigquery.TableMetadataToUpdate{ + Description: "new description", + }) + ``` + + * Client.Copy is replaced by separate methods for each of its four functions. + All options have been replaced by struct fields. + + * To load data from Google Cloud Storage into a table, use Table.LoaderFrom. + + Replace + ```go + client.Copy(ctx, table, gcsRef) + ``` + with + ```go + table.LoaderFrom(gcsRef).Run(ctx) + ``` + Instead of passing options to Copy, set fields on the Loader: + ```go + loader := table.LoaderFrom(gcsRef) + loader.WriteDisposition = bigquery.WriteTruncate + ``` + + * To extract data from a table into Google Cloud Storage, use + Table.ExtractorTo. Set fields on the returned Extractor instead of + passing options. + + Replace + ```go + client.Copy(ctx, gcsRef, table) + ``` + with + ```go + table.ExtractorTo(gcsRef).Run(ctx) + ``` + + * To copy data into a table from one or more other tables, use + Table.CopierFrom. Set fields on the returned Copier instead of passing options. + + Replace + ```go + client.Copy(ctx, dstTable, srcTable) + ``` + with + ```go + dst.Table.CopierFrom(srcTable).Run(ctx) + ``` + + * To start a query job, create a Query and call its Run method. Set fields + on the query instead of passing options. + + Replace + ```go + client.Copy(ctx, table, query) + ``` + with + ```go + query.Run(ctx) + ``` + + * Table.NewUploader has been renamed to Table.Uploader. Instead of options, + configure an Uploader by setting its fields. + Replace + ```go + u := table.NewUploader(bigquery.UploadIgnoreUnknownValues()) + ``` + with + ```go + u := table.NewUploader(bigquery.UploadIgnoreUnknownValues()) + u.IgnoreUnknownValues = true + ``` + +- pubsub: remove `pubsub.Done`. Use `iterator.Done` instead, where `iterator` is the package +`google.golang.org/api/iterator`. + +## v0.3.0 + +- storage: + * AdminClient replaced by methods on Client. + Replace + ```go + adminClient.CreateBucket(ctx, bucketName, attrs) + ``` + with + ```go + client.Bucket(bucketName).Create(ctx, projectID, attrs) + ``` + + * BucketHandle.List replaced by BucketHandle.Objects. + Replace + ```go + for query != nil { + objs, err := bucket.List(d.ctx, query) + if err != nil { ... } + query = objs.Next + for _, obj := range objs.Results { + fmt.Println(obj) + } + } + ``` + with + ```go + iter := bucket.Objects(d.ctx, query) + for { + obj, err := iter.Next() + if err == iterator.Done { + break + } + if err != nil { ... } + fmt.Println(obj) + } + ``` + (The `iterator` package is at `google.golang.org/api/iterator`.) + + Replace `Query.Cursor` with `ObjectIterator.PageInfo().Token`. + + Replace `Query.MaxResults` with `ObjectIterator.PageInfo().MaxSize`. + + + * ObjectHandle.CopyTo replaced by ObjectHandle.CopierFrom. + Replace + ```go + attrs, err := src.CopyTo(ctx, dst, nil) + ``` + with + ```go + attrs, err := dst.CopierFrom(src).Run(ctx) + ``` + + Replace + ```go + attrs, err := src.CopyTo(ctx, dst, &storage.ObjectAttrs{ContextType: "text/html"}) + ``` + with + ```go + c := dst.CopierFrom(src) + c.ContextType = "text/html" + attrs, err := c.Run(ctx) + ``` + + * ObjectHandle.ComposeFrom replaced by ObjectHandle.ComposerFrom. + Replace + ```go + attrs, err := dst.ComposeFrom(ctx, []*storage.ObjectHandle{src1, src2}, nil) + ``` + with + ```go + attrs, err := dst.ComposerFrom(src1, src2).Run(ctx) + ``` + + * ObjectHandle.Update's ObjectAttrs argument replaced by ObjectAttrsToUpdate. + Replace + ```go + attrs, err := obj.Update(ctx, &storage.ObjectAttrs{ContextType: "text/html"}) + ``` + with + ```go + attrs, err := obj.Update(ctx, storage.ObjectAttrsToUpdate{ContextType: "text/html"}) + ``` + + * ObjectHandle.WithConditions replaced by ObjectHandle.If. + Replace + ```go + obj.WithConditions(storage.Generation(gen), storage.IfMetaGenerationMatch(mgen)) + ``` + with + ```go + obj.Generation(gen).If(storage.Conditions{MetagenerationMatch: mgen}) + ``` + + Replace + ```go + obj.WithConditions(storage.IfGenerationMatch(0)) + ``` + with + ```go + obj.If(storage.Conditions{DoesNotExist: true}) + ``` + + * `storage.Done` replaced by `iterator.Done` (from package `google.golang.org/api/iterator`). + +- Package preview/logging deleted. Use logging instead. + +## v0.2.0 + +- Logging client replaced with preview version (see below). + +- New clients for some of Google's Machine Learning APIs: Vision, Speech, and +Natural Language. + +- Preview version of a new [Stackdriver Logging][cloud-logging] client in +[`cloud.google.com/go/preview/logging`](https://godoc.org/cloud.google.com/go/preview/logging). +This client uses gRPC as its transport layer, and supports log reading, sinks +and metrics. It will replace the current client at `cloud.google.com/go/logging` shortly. + + diff --git a/vendor/cloud.google.com/go/CODE_OF_CONDUCT.md b/vendor/cloud.google.com/go/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..8fd1bc9c22bd --- /dev/null +++ b/vendor/cloud.google.com/go/CODE_OF_CONDUCT.md @@ -0,0 +1,44 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, +and in the interest of fostering an open and welcoming community, +we pledge to respect all people who contribute through reporting issues, +posting feature requests, updating documentation, +submitting pull requests or patches, and other activities. + +We are committed to making participation in this project +a harassment-free experience for everyone, +regardless of level of experience, gender, gender identity and expression, +sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, +such as physical or electronic +addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct. +By adopting this Code of Conduct, +project maintainers commit themselves to fairly and consistently +applying these principles to every aspect of managing this project. +Project maintainers who do not follow or enforce the Code of Conduct +may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior +may be reported by opening an issue +or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, +available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) + diff --git a/vendor/cloud.google.com/go/CONTRIBUTING.md b/vendor/cloud.google.com/go/CONTRIBUTING.md new file mode 100644 index 000000000000..fe82c7c38a01 --- /dev/null +++ b/vendor/cloud.google.com/go/CONTRIBUTING.md @@ -0,0 +1,306 @@ +# Contributing + +1. [Install Go](https://golang.org/dl/). + 1. Ensure that your `GOBIN` directory (by default `$(go env GOPATH)/bin`) + is in your `PATH`. + 1. Check it's working by running `go version`. + * If it doesn't work, check the install location, usually + `/usr/local/go`, is on your `PATH`. + +1. Sign one of the +[contributor license agreements](#contributor-license-agreements) below. + +1. Run `go get golang.org/x/review/git-codereview && go install golang.org/x/review/git-codereview` +to install the code reviewing tool. + + 1. Ensure it's working by running `git codereview` (check your `PATH` if + not). + + 1. If you would like, you may want to set up aliases for `git-codereview`, + such that `git codereview change` becomes `git change`. See the + [godoc](https://godoc.org/golang.org/x/review/git-codereview) for details. + + * Should you run into issues with the `git-codereview` tool, please note + that all error messages will assume that you have set up these aliases. + +1. Change to a directory of your choosing and clone the repo. + + ``` + cd ~/code + git clone https://code.googlesource.com/gocloud + ``` + + * If you have already checked out the source, make sure that the remote + `git` `origin` is https://code.googlesource.com/gocloud: + + ``` + git remote -v + # ... + git remote set-url origin https://code.googlesource.com/gocloud + ``` + + * The project uses [Go Modules](https://blog.golang.org/using-go-modules) + for dependency management See + [`gopls`](https://github.com/golang/go/wiki/gopls) for making your editor + work with modules. + +1. Change to the project directory: + + ``` + cd ~/code/gocloud + ``` + +1. Make sure your `git` auth is configured correctly by visiting +https://code.googlesource.com, clicking "Generate Password" at the top-right, +and following the directions. Otherwise, `git codereview mail` in the next step +will fail. + +1. Now you are ready to make changes. Don't create a new branch or make commits in the traditional +way. Use the following`git codereview` commands to create a commit and create a Gerrit CL: + + ``` + git codereview change # Use this instead of git checkout -b + # Make changes. + git add ... + git codereview change # Use this instead of git commit + git codereview mail # If this fails, the error message will contain instructions to fix it. + ``` + + * This will create a new `git` branch for you to develop on. Once your + change is merged, you can delete this branch. + +1. As you make changes for code review, ammend the commit and re-mail the +change: + + ``` + # Make more changes. + git add ... + git codereview change + git codereview mail + ``` + + * **Warning**: do not change the `Change-Id` at the bottom of the commit + message - it's how Gerrit knows which change this is (or if it's new). + + * When you fixes issues from code review, respond to each code review + message then click **Reply** at the top of the page. + + * Each new mailed amendment will create a new patch set for + your change in Gerrit. Patch sets can be compared and reviewed. + + * **Note**: if your change includes a breaking change, our breaking change + detector will cause CI/CD to fail. If your breaking change is acceptable + in some way, add a `BREAKING_CHANGE_ACCEPTABLE=` line to the commit + message to cause the detector not to be run and to make it clear why that is + acceptable. + +1. Finally, add reviewers to your CL when it's ready for review. Reviewers will +not be added automatically. If you're not sure who to add for your code review, +add deklerk@, tbp@, cbro@, and codyoss@. + + +## Integration Tests + +In addition to the unit tests, you may run the integration test suite. These +directions describe setting up your environment to run integration tests for +_all_ packages: note that many of these instructions may be redundant if you +intend only to run integration tests on a single package. + +#### GCP Setup + +To run the integrations tests, creation and configuration of two projects in +the Google Developers Console is required: one specifically for Firestore +integration tests, and another for all other integration tests. We'll refer to +these projects as "general project" and "Firestore project". + +After creating each project, you must [create a service account](https://developers.google.com/identity/protocols/OAuth2ServiceAccount#creatinganaccount) +for each project. Ensure the project-level **Owner** +[IAM role](console.cloud.google.com/iam-admin/iam/project) role is added to +each service account. During the creation of the service account, you should +download the JSON credential file for use later. + +Next, ensure the following APIs are enabled in the general project: + +- BigQuery API +- BigQuery Data Transfer API +- Cloud Dataproc API +- Cloud Dataproc Control API Private +- Cloud Datastore API +- Cloud Firestore API +- Cloud Key Management Service (KMS) API +- Cloud Natural Language API +- Cloud OS Login API +- Cloud Pub/Sub API +- Cloud Resource Manager API +- Cloud Spanner API +- Cloud Speech API +- Cloud Translation API +- Cloud Video Intelligence API +- Cloud Vision API +- Compute Engine API +- Compute Engine Instance Group Manager API +- Container Registry API +- Firebase Rules API +- Google Cloud APIs +- Google Cloud Deployment Manager V2 API +- Google Cloud SQL +- Google Cloud Storage +- Google Cloud Storage JSON API +- Google Compute Engine Instance Group Updater API +- Google Compute Engine Instance Groups API +- Kubernetes Engine API +- Stackdriver Error Reporting API + +Next, create a Datastore database in the general project, and a Firestore +database in the Firestore project. + +Finally, in the general project, create an API key for the translate API: + +- Go to GCP Developer Console. +- Navigate to APIs & Services > Credentials. +- Click Create Credentials > API Key. +- Save this key for use in `GCLOUD_TESTS_API_KEY` as described below. + +#### Local Setup + +Once the two projects are created and configured, set the following environment +variables: + +- `GCLOUD_TESTS_GOLANG_PROJECT_ID`: Developers Console project's ID (e.g. +bamboo-shift-455) for the general project. +- `GCLOUD_TESTS_GOLANG_KEY`: The path to the JSON key file of the general +project's service account. +- `GCLOUD_TESTS_GOLANG_FIRESTORE_PROJECT_ID`: Developers Console project's ID +(e.g. doorway-cliff-677) for the Firestore project. +- `GCLOUD_TESTS_GOLANG_FIRESTORE_KEY`: The path to the JSON key file of the +Firestore project's service account. +- `GCLOUD_TESTS_GOLANG_KEYRING`: The full name of the keyring for the tests, +in the form +"projects/P/locations/L/keyRings/R". The creation of this is described below. +- `GCLOUD_TESTS_API_KEY`: API key for using the Translate API. +- `GCLOUD_TESTS_GOLANG_ZONE`: Compute Engine zone. + +Install the [gcloud command-line tool][gcloudcli] to your machine and use it to +create some resources used in integration tests. + +From the project's root directory: + +``` sh +# Sets the default project in your env. +$ gcloud config set project $GCLOUD_TESTS_GOLANG_PROJECT_ID + +# Authenticates the gcloud tool with your account. +$ gcloud auth login + +# Create the indexes used in the datastore integration tests. +$ gcloud datastore indexes create datastore/testdata/index.yaml + +# Creates a Google Cloud storage bucket with the same name as your test project, +# and with the Stackdriver Logging service account as owner, for the sink +# integration tests in logging. +$ gsutil mb gs://$GCLOUD_TESTS_GOLANG_PROJECT_ID +$ gsutil acl ch -g cloud-logs@google.com:O gs://$GCLOUD_TESTS_GOLANG_PROJECT_ID + +# Creates a PubSub topic for integration tests of storage notifications. +$ gcloud beta pubsub topics create go-storage-notification-test +# Next, go to the Pub/Sub dashboard in GCP console. Authorize the user +# "service-@gs-project-accounts.iam.gserviceaccount.com" +# as a publisher to that topic. + +# Creates a Spanner instance for the spanner integration tests. +$ gcloud beta spanner instances create go-integration-test --config regional-us-central1 --nodes 10 --description 'Instance for go client test' +# NOTE: Spanner instances are priced by the node-hour, so you may want to +# delete the instance after testing with 'gcloud beta spanner instances delete'. + +$ export MY_KEYRING=some-keyring-name +$ export MY_LOCATION=global +# Creates a KMS keyring, in the same location as the default location for your +# project's buckets. +$ gcloud kms keyrings create $MY_KEYRING --location $MY_LOCATION +# Creates two keys in the keyring, named key1 and key2. +$ gcloud kms keys create key1 --keyring $MY_KEYRING --location $MY_LOCATION --purpose encryption +$ gcloud kms keys create key2 --keyring $MY_KEYRING --location $MY_LOCATION --purpose encryption +# Sets the GCLOUD_TESTS_GOLANG_KEYRING environment variable. +$ export GCLOUD_TESTS_GOLANG_KEYRING=projects/$GCLOUD_TESTS_GOLANG_PROJECT_ID/locations/$MY_LOCATION/keyRings/$MY_KEYRING +# Authorizes Google Cloud Storage to encrypt and decrypt using key1. +gsutil kms authorize -p $GCLOUD_TESTS_GOLANG_PROJECT_ID -k $GCLOUD_TESTS_GOLANG_KEYRING/cryptoKeys/key1 +``` + +#### Running + +Once you've done the necessary setup, you can run the integration tests by +running: + +``` sh +$ go test -v cloud.google.com/go/... +``` + +#### Replay + +Some packages can record the RPCs during integration tests to a file for +subsequent replay. To record, pass the `-record` flag to `go test`. The +recording will be saved to the _package_`.replay` file. To replay integration +tests from a saved recording, the replay file must be present, the `-short` +flag must be passed to `go test`, and the `GCLOUD_TESTS_GOLANG_ENABLE_REPLAY` +environment variable must have a non-empty value. + +## Contributor License Agreements + +Before we can accept your pull requests you'll need to sign a Contributor +License Agreement (CLA): + +- **If you are an individual writing original source code** and **you own the +intellectual property**, then you'll need to sign an [individual CLA][indvcla]. +- **If you work for a company that wants to allow you to contribute your +work**, then you'll need to sign a [corporate CLA][corpcla]. + +You can sign these electronically (just scroll to the bottom). After that, +we'll be able to accept your pull requests. + +## Contributor Code of Conduct + +As contributors and maintainers of this project, +and in the interest of fostering an open and welcoming community, +we pledge to respect all people who contribute through reporting issues, +posting feature requests, updating documentation, +submitting pull requests or patches, and other activities. + +We are committed to making participation in this project +a harassment-free experience for everyone, +regardless of level of experience, gender, gender identity and expression, +sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, +such as physical or electronic +addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct. +By adopting this Code of Conduct, +project maintainers commit themselves to fairly and consistently +applying these principles to every aspect of managing this project. +Project maintainers who do not follow or enforce the Code of Conduct +may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior +may be reported by opening an issue +or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, +available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) + +[gcloudcli]: https://developers.google.com/cloud/sdk/gcloud/ +[indvcla]: https://developers.google.com/open-source/cla/individual +[corpcla]: https://developers.google.com/open-source/cla/corporate diff --git a/vendor/cloud.google.com/go/README.md b/vendor/cloud.google.com/go/README.md new file mode 100644 index 000000000000..69ac0046e023 --- /dev/null +++ b/vendor/cloud.google.com/go/README.md @@ -0,0 +1,179 @@ +# Google Cloud Client Libraries for Go + +[![GoDoc](https://godoc.org/cloud.google.com/go?status.svg)](https://godoc.org/cloud.google.com/go) + +Go packages for [Google Cloud Platform](https://cloud.google.com) services. + +``` go +import "cloud.google.com/go" +``` + +To install the packages on your system, *do not clone the repo*. Instead: + +1. Change to your project directory: + + ``` + cd /my/cloud/project + ``` +1. Get the package you want to use. Some products have their own module, so it's + best to `go get` the package(s) you want to use: + + ``` + $ go get cloud.google.com/go/firestore # Replace with the package you want to use. + ``` + +**NOTE:** Some of these packages are under development, and may occasionally +make backwards-incompatible changes. + +**NOTE:** Github repo is a mirror of [https://code.googlesource.com/gocloud](https://code.googlesource.com/gocloud). + +## Supported APIs + +Google API | Status | Package +------------------------------------------------|--------------|----------------------------------------------------------- +[Asset][cloud-asset] | alpha | [`cloud.google.com/go/asset/v1beta`](https://godoc.org/cloud.google.com/go/asset/v1beta) +[Automl][cloud-automl] | stable | [`cloud.google.com/go/automl/apiv1`](https://godoc.org/cloud.google.com/go/automl/apiv1) +[BigQuery][cloud-bigquery] | stable | [`cloud.google.com/go/bigquery`](https://godoc.org/cloud.google.com/go/bigquery) +[Bigtable][cloud-bigtable] | stable | [`cloud.google.com/go/bigtable`](https://godoc.org/cloud.google.com/go/bigtable) +[Cloudbuild][cloud-build] | stable | [`cloud.google.com/go/cloudbuild/apiv1`](https://godoc.org/cloud.google.com/go/cloudbuild/apiv1) +[Cloudtasks][cloud-tasks] | stable | [`cloud.google.com/go/cloudtasks/apiv2`](https://godoc.org/cloud.google.com/go/cloudtasks/apiv2) +[Container][cloud-container] | stable | [`cloud.google.com/go/container/apiv1`](https://godoc.org/cloud.google.com/go/container/apiv1) +[ContainerAnalysis][cloud-containeranalysis] | beta | [`cloud.google.com/go/containeranalysis/apiv1`](https://godoc.org/cloud.google.com/go/containeranalysis/apiv1) +[Dataproc][cloud-dataproc] | stable | [`cloud.google.com/go/dataproc/apiv1`](https://godoc.org/cloud.google.com/go/dataproc/apiv1) +[Datastore][cloud-datastore] | stable | [`cloud.google.com/go/datastore`](https://godoc.org/cloud.google.com/go/datastore) +[Debugger][cloud-debugger] | stable | [`cloud.google.com/go/debugger/apiv2`](https://godoc.org/cloud.google.com/go/debugger/apiv2) +[Dialogflow][cloud-dialogflow] | stable | [`cloud.google.com/go/dialogflow/apiv2`](https://godoc.org/cloud.google.com/go/dialogflow/apiv2) +[Data Loss Prevention][cloud-dlp] | stable | [`cloud.google.com/go/dlp/apiv2`](https://godoc.org/cloud.google.com/go/dlp/apiv2) +[ErrorReporting][cloud-errors] | alpha | [`cloud.google.com/go/errorreporting`](https://godoc.org/cloud.google.com/go/errorreporting) +[Firestore][cloud-firestore] | stable | [`cloud.google.com/go/firestore`](https://godoc.org/cloud.google.com/go/firestore) +[IAM][cloud-iam] | stable | [`cloud.google.com/go/iam`](https://godoc.org/cloud.google.com/go/iam) +[IoT][cloud-iot] | stable | [`cloud.google.com/go/iot/apiv1`](https://godoc.org/cloud.google.com/go/iot/apiv1) +[IRM][cloud-irm] | alpha | [`cloud.google.com/go/irm/apiv1alpha2`](https://godoc.org/cloud.google.com/go/irm/apiv1alpha2) +[KMS][cloud-kms] | stable | [`cloud.google.com/go/kms`](https://godoc.org/cloud.google.com/go/kms) +[Natural Language][cloud-natural-language] | stable | [`cloud.google.com/go/language/apiv1`](https://godoc.org/cloud.google.com/go/language/apiv1) +[Logging][cloud-logging] | stable | [`cloud.google.com/go/logging`](https://godoc.org/cloud.google.com/go/logging) +[Memorystore][cloud-memorystore] | alpha | [`cloud.google.com/go/redis/apiv1`](https://godoc.org/cloud.google.com/go/redis/apiv1) +[Monitoring][cloud-monitoring] | alpha | [`cloud.google.com/go/monitoring/apiv3`](https://godoc.org/cloud.google.com/go/monitoring/apiv3) +[OS Login][cloud-oslogin] | alpha | [`cloud.google.com/go/oslogin/apiv1`](https://godoc.org/cloud.google.com/go/oslogin/apiv1) +[Pub/Sub][cloud-pubsub] | stable | [`cloud.google.com/go/pubsub`](https://godoc.org/cloud.google.com/go/pubsub) +[Phishing Protection][cloud-phishingprotection] | alpha | [`cloud.google.com/go/phishingprotection/apiv1beta1`](https://godoc.org/cloud.google.com/go/phishingprotection/apiv1beta1) +[reCAPTCHA Enterprise][cloud-recaptcha] | alpha | [`cloud.google.com/go/recaptchaenterprise/apiv1beta1`](https://godoc.org/cloud.google.com/go/recaptchaenterprise/apiv1beta1) +[Recommender][cloud-recommender] | beta | [`cloud.google.com/go/recommender/apiv1beta1`](https://godoc.org/cloud.google.com/go/recommender/apiv1beta1) +[Scheduler][cloud-scheduler] | stable | [`cloud.google.com/go/scheduler/apiv1`](https://godoc.org/cloud.google.com/go/scheduler/apiv1) +[Securitycenter][cloud-securitycenter] | alpha | [`cloud.google.com/go/securitycenter/apiv1`](https://godoc.org/cloud.google.com/go/securitycenter/apiv1) +[Spanner][cloud-spanner] | stable | [`cloud.google.com/go/spanner`](https://godoc.org/cloud.google.com/go/spanner) +[Speech][cloud-speech] | stable | [`cloud.google.com/go/speech/apiv1`](https://godoc.org/cloud.google.com/go/speech/apiv1) +[Storage][cloud-storage] | stable | [`cloud.google.com/go/storage`](https://godoc.org/cloud.google.com/go/storage) +[Talent][cloud-talent] | alpha | [`cloud.google.com/go/talent/apiv4beta1`](https://godoc.org/cloud.google.com/go/talent/apiv4beta1) +[Text To Speech][cloud-texttospeech] | alpha | [`cloud.google.com/go/texttospeech/apiv1`](https://godoc.org/cloud.google.com/go/texttospeech/apiv1) +[Trace][cloud-trace] | alpha | [`cloud.google.com/go/trace/apiv2`](https://godoc.org/cloud.google.com/go/trace/apiv2) +[Translate][cloud-translate] | stable | [`cloud.google.com/go/translate`](https://godoc.org/cloud.google.com/go/translate) +[Video Intelligence][cloud-video] | alpha | [`cloud.google.com/go/videointelligence/apiv1beta1`](https://godoc.org/cloud.google.com/go/videointelligence/apiv1beta1) +[Vision][cloud-vision] | stable | [`cloud.google.com/go/vision/apiv1`](https://godoc.org/cloud.google.com/go/vision/apiv1) +[Webrisk][cloud-webrisk] | alpha | [`cloud.google.com/go/webrisk/apiv1beta1`](https://godoc.org/cloud.google.com/go/webrisk/apiv1beta1) + +> **Alpha status**: the API is still being actively developed. As a +> result, it might change in backward-incompatible ways and is not recommended +> for production use. +> +> **Beta status**: the API is largely complete, but still has outstanding +> features and bugs to be addressed. There may be minor backwards-incompatible +> changes where necessary. +> +> **Stable status**: the API is mature and ready for production use. We will +> continue addressing bugs and feature requests. + +Documentation and examples are available at [godoc.org/cloud.google.com/go](https://godoc.org/cloud.google.com/go) + +## Go Versions Supported + +We support the two most recent major versions of Go. If Google App Engine uses +an older version, we support that as well. + +## Authorization + +By default, each API will use [Google Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials) +for authorization credentials used in calling the API endpoints. This will allow your +application to run in many environments without requiring explicit configuration. + +[snip]:# (auth) +```go +client, err := storage.NewClient(ctx) +``` + +To authorize using a +[JSON key file](https://cloud.google.com/iam/docs/managing-service-account-keys), +pass +[`option.WithCredentialsFile`](https://godoc.org/google.golang.org/api/option#WithCredentialsFile) +to the `NewClient` function of the desired package. For example: + +[snip]:# (auth-JSON) +```go +client, err := storage.NewClient(ctx, option.WithCredentialsFile("path/to/keyfile.json")) +``` + +You can exert more control over authorization by using the +[`golang.org/x/oauth2`](https://godoc.org/golang.org/x/oauth2) package to +create an `oauth2.TokenSource`. Then pass +[`option.WithTokenSource`](https://godoc.org/google.golang.org/api/option#WithTokenSource) +to the `NewClient` function: +[snip]:# (auth-ts) +```go +tokenSource := ... +client, err := storage.NewClient(ctx, option.WithTokenSource(tokenSource)) +``` + +## Contributing + +Contributions are welcome. Please, see the +[CONTRIBUTING](https://github.com/GoogleCloudPlatform/google-cloud-go/blob/master/CONTRIBUTING.md) +document for details. We're using Gerrit for our code reviews. Please don't open pull +requests against this repo, new pull requests will be automatically closed. + +Please note that this project is released with a Contributor Code of Conduct. +By participating in this project you agree to abide by its terms. +See [Contributor Code of Conduct](https://github.com/GoogleCloudPlatform/google-cloud-go/blob/master/CONTRIBUTING.md#contributor-code-of-conduct) +for more information. + +[cloud-asset]: https://cloud.google.com/security-command-center/docs/how-to-asset-inventory +[cloud-automl]: https://cloud.google.com/automl +[cloud-build]: https://cloud.google.com/cloud-build/ +[cloud-bigquery]: https://cloud.google.com/bigquery/ +[cloud-bigtable]: https://cloud.google.com/bigtable/ +[cloud-container]: https://cloud.google.com/containers/ +[cloud-containeranalysis]: https://cloud.google.com/container-registry/docs/container-analysis +[cloud-dataproc]: https://cloud.google.com/dataproc/ +[cloud-datastore]: https://cloud.google.com/datastore/ +[cloud-dialogflow]: https://cloud.google.com/dialogflow-enterprise/ +[cloud-debugger]: https://cloud.google.com/debugger/ +[cloud-dlp]: https://cloud.google.com/dlp/ +[cloud-errors]: https://cloud.google.com/error-reporting/ +[cloud-firestore]: https://cloud.google.com/firestore/ +[cloud-iam]: https://cloud.google.com/iam/ +[cloud-iot]: https://cloud.google.com/iot-core/ +[cloud-irm]: https://cloud.google.com/incident-response/docs/concepts +[cloud-kms]: https://cloud.google.com/kms/ +[cloud-pubsub]: https://cloud.google.com/pubsub/ +[cloud-storage]: https://cloud.google.com/storage/ +[cloud-language]: https://cloud.google.com/natural-language +[cloud-logging]: https://cloud.google.com/logging/ +[cloud-natural-language]: https://cloud.google.com/natural-language/ +[cloud-memorystore]: https://cloud.google.com/memorystore/ +[cloud-monitoring]: https://cloud.google.com/monitoring/ +[cloud-oslogin]: https://cloud.google.com/compute/docs/oslogin/rest +[cloud-phishingprotection]: https://cloud.google.com/phishing-protection/ +[cloud-securitycenter]: https://cloud.google.com/security-command-center/ +[cloud-scheduler]: https://cloud.google.com/scheduler +[cloud-spanner]: https://cloud.google.com/spanner/ +[cloud-speech]: https://cloud.google.com/speech +[cloud-talent]: https://cloud.google.com/solutions/talent-solution/ +[cloud-tasks]: https://cloud.google.com/tasks/ +[cloud-texttospeech]: https://cloud.google.com/texttospeech/ +[cloud-talent]: https://cloud.google.com/solutions/talent-solution/ +[cloud-trace]: https://cloud.google.com/trace/ +[cloud-translate]: https://cloud.google.com/translate +[cloud-recaptcha]: https://cloud.google.com/recaptcha-enterprise/ +[cloud-recommender]: https://cloud.google.com/recommendations/ +[cloud-video]: https://cloud.google.com/video-intelligence/ +[cloud-vision]: https://cloud.google.com/vision +[cloud-webrisk]: https://cloud.google.com/web-risk/ diff --git a/vendor/cloud.google.com/go/RELEASING.md b/vendor/cloud.google.com/go/RELEASING.md new file mode 100644 index 000000000000..02added7992f --- /dev/null +++ b/vendor/cloud.google.com/go/RELEASING.md @@ -0,0 +1,153 @@ +# Setup from scratch + +1. [Install Go](https://golang.org/dl/). + 1. Ensure that your `GOBIN` directory (by default `$(go env GOPATH)/bin`) + is in your `PATH`. + 1. Check it's working by running `go version`. + * If it doesn't work, check the install location, usually + `/usr/local/go`, is on your `PATH`. + +1. Sign one of the +[contributor license agreements](#contributor-license-agreements) below. + +1. Run `go get golang.org/x/review/git-codereview && go install golang.org/x/review/git-codereview` +to install the code reviewing tool. + + 1. Ensure it's working by running `git codereview` (check your `PATH` if + not). + + 1. If you would like, you may want to set up aliases for `git-codereview`, + such that `git codereview change` becomes `git change`. See the + [godoc](https://godoc.org/golang.org/x/review/git-codereview) for details. + + * Should you run into issues with the `git-codereview` tool, please note + that all error messages will assume that you have set up these aliases. + +1. Change to a directory of your choosing and clone the repo. + + ``` + cd ~/code + git clone https://code.googlesource.com/gocloud + ``` + + * If you have already checked out the source, make sure that the remote + `git` `origin` is https://code.googlesource.com/gocloud: + + ``` + git remote -v + # ... + git remote set-url origin https://code.googlesource.com/gocloud + ``` + + * The project uses [Go Modules](https://blog.golang.org/using-go-modules) + for dependency management See + [`gopls`](https://github.com/golang/go/wiki/gopls) for making your editor + work with modules. + +1. Change to the project directory and add the github remote: + + ``` + cd ~/code/gocloud + git remote add github https://github.com/googleapis/google-cloud-go + ``` + +1. Make sure your `git` auth is configured correctly by visiting +https://code.googlesource.com, clicking "Generate Password" at the top-right, +and following the directions. Otherwise, `git codereview mail` in the next step +will fail. + +# Which module to release? + +The Go client libraries have several modules. Each module does not strictly +correspond to a single library - they correspond to trees of directories. If a +file needs to be released, you must release the closest ancestor module. + +To see all modules: + +``` +$ cat `find . -name go.mod` | grep module +module cloud.google.com/go +module cloud.google.com/go/bigtable +module cloud.google.com/go/firestore +module cloud.google.com/go/bigquery +module cloud.google.com/go/storage +module cloud.google.com/go/datastore +module cloud.google.com/go/pubsub +module cloud.google.com/go/spanner +module cloud.google.com/go/logging +``` + +The `cloud.google.com/go` is the repository root module. Each other module is +a submodule. + +So, if you need to release a change in `bigtable/bttest/inmem.go`, the closest +ancestor module is `cloud.google.com/go/bigtable` - so you should release a new +version of the `cloud.google.com/go/bigtable` submodule. + +If you need to release a change in `asset/apiv1/asset_client.go`, the closest +ancestor module is `cloud.google.com/go` - so you should release a new version +of the `cloud.google.com/go` repository root module. Note: releasing +`cloud.google.com/go` has no impact on any of the submodules, and vice-versa. +They are released entirely independently. + +# How to release `cloud.google.com/go` + +1. Navigate to `~/code/gocloud/` and switch to master. +1. `git pull` +1. Run `git tag -l | grep -v beta | grep -v alpha` to see all existing releases. + The current latest tag `$CV` is the largest tag. It should look something + like `vX.Y.Z` (note: ignore all `LIB/vX.Y.Z` tags - these are tags for a + specific library, not the module root). We'll call the current version `$CV` + and the new version `$NV`. +1. On master, run `git log $CV...` to list all the changes since the last + release. NOTE: You must manually visually parse out changes to submodules [1] + (the `git log` is going to show you things in submodules, which are not going + to be part of your release). +1. Edit `CHANGES.md` to include a summary of the changes. +1. `cd internal/version && go generate && cd -` +1. Mail the CL: `git add -A && git change && git mail` +1. Wait for the CL to be submitted. Once it's submitted, and without submitting + any other CLs in the meantime: + a. Switch to master. + b. `git pull` + c. Tag the repo with the next version: `git tag $NV`. + d. Push the tag to both remotes: + `git push origin $NV` + `git push github $NV` +1. Update [the releases page](https://github.com/googleapis/google-cloud-go/releases) + with the new release, copying the contents of `CHANGES.md`. + +# How to release a submodule + +We have several submodules, including `cloud.google.com/go/logging`, +`cloud.google.com/go/datastore`, and so on. + +To release a submodule: + +(these instructions assume we're releasing `cloud.google.com/go/datastore` - adjust accordingly) + +1. Navigate to `~/code/gocloud/` and switch to master. +1. `git pull` +1. Run `git tag -l | grep datastore | grep -v beta | grep -v alpha` to see all + existing releases. The current latest tag `$CV` is the largest tag. It + should look something like `datastore/vX.Y.Z`. We'll call the current version + `$CV` and the new version `$NV`. +1. On master, run `git log $CV.. -- datastore/` to list all the changes to the + submodule directory since the last release. +1. Edit `datastore/CHANGES.md` to include a summary of the changes. +1. `cd internal/version && go generate && cd -` +1. Mail the CL: `git add -A && git change && git mail` +1. Wait for the CL to be submitted. Once it's submitted, and without submitting + any other CLs in the meantime: + a. Switch to master. + b. `git pull` + c. Tag the repo with the next version: `git tag $NV`. + d. Push the tag to both remotes: + `git push origin $NV` + `git push github $NV` +1. Update [the releases page](https://github.com/googleapis/google-cloud-go/releases) + with the new release, copying the contents of `datastore/CHANGES.md`. + +# Appendix + +1: This should get better as submodule tooling matures. diff --git a/vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json b/vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json new file mode 100644 index 000000000000..ca022ccc41a0 --- /dev/null +++ b/vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json @@ -0,0 +1,12 @@ +{ + "name": "metadata", + "name_pretty": "Google Compute Engine Metadata API", + "product_documentation": "https://cloud.google.com/compute/docs/storing-retrieving-metadata", + "client_documentation": "https://godoc.org/cloud.google.com/go/compute/metadata", + "release_level": "ga", + "language": "go", + "repo": "googleapis/google-cloud-go", + "distribution_name": "cloud.google.com/go/compute/metadata", + "api_id": "compute:metadata", + "requires_billing": false +} diff --git a/vendor/cloud.google.com/go/compute/metadata/metadata.go b/vendor/cloud.google.com/go/compute/metadata/metadata.go index 125b7033c96b..0b50c2a7a6c2 100644 --- a/vendor/cloud.google.com/go/compute/metadata/metadata.go +++ b/vendor/cloud.google.com/go/compute/metadata/metadata.go @@ -227,6 +227,9 @@ func InternalIP() (string, error) { return defaultClient.InternalIP() } // ExternalIP returns the instance's primary external (public) IP address. func ExternalIP() (string, error) { return defaultClient.ExternalIP() } +// Email calls Client.Email on the default client. +func Email(serviceAccount string) (string, error) { return defaultClient.Email(serviceAccount) } + // Hostname returns the instance's hostname. This will be of the form // ".c..internal". func Hostname() (string, error) { return defaultClient.Hostname() } @@ -301,7 +304,10 @@ func (c *Client) getETag(suffix string) (value, etag string, err error) { host = metadataIP } u := "http://" + host + "/computeMetadata/v1/" + suffix - req, _ := http.NewRequest("GET", u, nil) + req, err := http.NewRequest("GET", u, nil) + if err != nil { + return "", "", err + } req.Header.Set("Metadata-Flavor", "Google") req.Header.Set("User-Agent", userAgent) res, err := c.hc.Do(req) @@ -367,6 +373,16 @@ func (c *Client) InternalIP() (string, error) { return c.getTrimmed("instance/network-interfaces/0/ip") } +// Email returns the email address associated with the service account. +// The account may be empty or the string "default" to use the instance's +// main account. +func (c *Client) Email(serviceAccount string) (string, error) { + if serviceAccount == "" { + serviceAccount = "default" + } + return c.getTrimmed("instance/service-accounts/" + serviceAccount + "/email") +} + // ExternalIP returns the instance's primary external (public) IP address. func (c *Client) ExternalIP() (string, error) { return c.getTrimmed("instance/network-interfaces/0/access-configs/0/external-ip") @@ -394,11 +410,7 @@ func (c *Client) InstanceTags() ([]string, error) { // InstanceName returns the current VM's instance ID string. func (c *Client) InstanceName() (string, error) { - host, err := c.Hostname() - if err != nil { - return "", err - } - return strings.Split(host, ".")[0], nil + return c.getTrimmed("instance/name") } // Zone returns the current VM's zone, such as "us-central1-b". diff --git a/vendor/github.com/census-instrumentation/opencensus-proto/LICENSE b/vendor/cloud.google.com/go/datastore/LICENSE similarity index 100% rename from vendor/github.com/census-instrumentation/opencensus-proto/LICENSE rename to vendor/cloud.google.com/go/datastore/LICENSE diff --git a/vendor/cloud.google.com/go/datastore/README.md b/vendor/cloud.google.com/go/datastore/README.md new file mode 100644 index 000000000000..298895763eb3 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/README.md @@ -0,0 +1,41 @@ +## Cloud Datastore [![GoDoc](https://godoc.org/cloud.google.com/go/datastore?status.svg)](https://godoc.org/cloud.google.com/go/datastore) + +- [About Cloud Datastore](https://cloud.google.com/datastore/) +- [Activating the API for your project](https://cloud.google.com/datastore/docs/activate) +- [API documentation](https://cloud.google.com/datastore/docs) +- [Go client documentation](https://godoc.org/cloud.google.com/go/datastore) +- [Complete sample program](https://github.com/GoogleCloudPlatform/golang-samples/tree/master/datastore/tasks) + +### Example Usage + +First create a `datastore.Client` to use throughout your application: + +[snip]:# (datastore-1) +```go +client, err := datastore.NewClient(ctx, "my-project-id") +if err != nil { + log.Fatal(err) +} +``` + +Then use that client to interact with the API: + +[snip]:# (datastore-2) +```go +type Post struct { + Title string + Body string `datastore:",noindex"` + PublishedAt time.Time +} +keys := []*datastore.Key{ + datastore.NameKey("Post", "post1", nil), + datastore.NameKey("Post", "post2", nil), +} +posts := []*Post{ + {Title: "Post 1", Body: "...", PublishedAt: time.Now()}, + {Title: "Post 2", Body: "...", PublishedAt: time.Now()}, +} +if _, err := client.PutMulti(ctx, keys, posts); err != nil { + log.Fatal(err) +} +``` \ No newline at end of file diff --git a/vendor/cloud.google.com/go/datastore/client.go b/vendor/cloud.google.com/go/datastore/client.go new file mode 100644 index 000000000000..3eba4d5c575c --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/client.go @@ -0,0 +1,118 @@ +// Copyright 2017 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "context" + "fmt" + "time" + + "cloud.google.com/go/internal" + "cloud.google.com/go/internal/version" + gax "github.com/googleapis/gax-go/v2" + pb "google.golang.org/genproto/googleapis/datastore/v1" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" +) + +// datastoreClient is a wrapper for the pb.DatastoreClient that includes gRPC +// metadata to be sent in each request for server-side traffic management. +type datastoreClient struct { + // Embed so we still implement the DatastoreClient interface, + // if the interface adds more methods. + pb.DatastoreClient + + c pb.DatastoreClient + md metadata.MD +} + +func newDatastoreClient(conn *grpc.ClientConn, projectID string) pb.DatastoreClient { + return &datastoreClient{ + c: pb.NewDatastoreClient(conn), + md: metadata.Pairs( + resourcePrefixHeader, "projects/"+projectID, + "x-goog-api-client", fmt.Sprintf("gl-go/%s gccl/%s grpc/", version.Go(), version.Repo)), + } +} + +func (dc *datastoreClient) Lookup(ctx context.Context, in *pb.LookupRequest, opts ...grpc.CallOption) (res *pb.LookupResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.Lookup(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) RunQuery(ctx context.Context, in *pb.RunQueryRequest, opts ...grpc.CallOption) (res *pb.RunQueryResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.RunQuery(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) BeginTransaction(ctx context.Context, in *pb.BeginTransactionRequest, opts ...grpc.CallOption) (res *pb.BeginTransactionResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.BeginTransaction(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) Commit(ctx context.Context, in *pb.CommitRequest, opts ...grpc.CallOption) (res *pb.CommitResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.Commit(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) Rollback(ctx context.Context, in *pb.RollbackRequest, opts ...grpc.CallOption) (res *pb.RollbackResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.Rollback(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) AllocateIds(ctx context.Context, in *pb.AllocateIdsRequest, opts ...grpc.CallOption) (res *pb.AllocateIdsResponse, err error) { + err = dc.invoke(ctx, func(ctx context.Context) error { + res, err = dc.c.AllocateIds(ctx, in, opts...) + return err + }) + return res, err +} + +func (dc *datastoreClient) invoke(ctx context.Context, f func(ctx context.Context) error) error { + ctx = metadata.NewOutgoingContext(ctx, dc.md) + return internal.Retry(ctx, gax.Backoff{Initial: 100 * time.Millisecond}, func() (stop bool, err error) { + err = f(ctx) + return !shouldRetry(err), err + }) +} + +func shouldRetry(err error) bool { + if err == nil { + return false + } + s, ok := status.FromError(err) + if !ok { + return false + } + // See https://cloud.google.com/datastore/docs/concepts/errors. + return s.Code() == codes.Unavailable || s.Code() == codes.DeadlineExceeded +} diff --git a/vendor/cloud.google.com/go/datastore/datastore.go b/vendor/cloud.google.com/go/datastore/datastore.go new file mode 100644 index 000000000000..dbf085c04ef4 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/datastore.go @@ -0,0 +1,670 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "context" + "errors" + "fmt" + "log" + "os" + "reflect" + + "cloud.google.com/go/internal/trace" + "google.golang.org/api/option" + "google.golang.org/api/transport" + gtransport "google.golang.org/api/transport/grpc" + pb "google.golang.org/genproto/googleapis/datastore/v1" + "google.golang.org/grpc" +) + +const ( + prodAddr = "datastore.googleapis.com:443" + userAgent = "gcloud-golang-datastore/20160401" +) + +// ScopeDatastore grants permissions to view and/or manage datastore entities +const ScopeDatastore = "https://www.googleapis.com/auth/datastore" + +// DetectProjectID is a sentinel value that instructs NewClient to detect the +// project ID. It is given in place of the projectID argument. NewClient will +// use the project ID from the given credentials or the default credentials +// (https://developers.google.com/accounts/docs/application-default-credentials) +// if no credentials were provided. When providing credentials, not all +// options will allow NewClient to extract the project ID. Specifically a JWT +// does not have the project ID encoded. +const DetectProjectID = "*detect-project-id*" + +// resourcePrefixHeader is the name of the metadata header used to indicate +// the resource being operated on. +const resourcePrefixHeader = "google-cloud-resource-prefix" + +// Client is a client for reading and writing data in a datastore dataset. +type Client struct { + conn *grpc.ClientConn + client pb.DatastoreClient + dataset string // Called dataset by the datastore API, synonym for project ID. +} + +// NewClient creates a new Client for a given dataset. If the project ID is +// empty, it is derived from the DATASTORE_PROJECT_ID environment variable. +// If the DATASTORE_EMULATOR_HOST environment variable is set, client will use +// its value to connect to a locally-running datastore emulator. +// DetectProjectID can be passed as the projectID argument to instruct +// NewClient to detect the project ID from the credentials. +func NewClient(ctx context.Context, projectID string, opts ...option.ClientOption) (*Client, error) { + var o []option.ClientOption + // Environment variables for gcd emulator: + // https://cloud.google.com/datastore/docs/tools/datastore-emulator + // If the emulator is available, dial it without passing any credentials. + if addr := os.Getenv("DATASTORE_EMULATOR_HOST"); addr != "" { + o = []option.ClientOption{ + option.WithEndpoint(addr), + option.WithoutAuthentication(), + option.WithGRPCDialOption(grpc.WithInsecure()), + } + } else { + o = []option.ClientOption{ + option.WithEndpoint(prodAddr), + option.WithScopes(ScopeDatastore), + option.WithUserAgent(userAgent), + } + } + // Warn if we see the legacy emulator environment variables. + if os.Getenv("DATASTORE_HOST") != "" && os.Getenv("DATASTORE_EMULATOR_HOST") == "" { + log.Print("WARNING: legacy environment variable DATASTORE_HOST is ignored. Use DATASTORE_EMULATOR_HOST instead.") + } + if os.Getenv("DATASTORE_DATASET") != "" && os.Getenv("DATASTORE_PROJECT_ID") == "" { + log.Print("WARNING: legacy environment variable DATASTORE_DATASET is ignored. Use DATASTORE_PROJECT_ID instead.") + } + if projectID == "" { + projectID = os.Getenv("DATASTORE_PROJECT_ID") + } + + o = append(o, opts...) + + if projectID == DetectProjectID { + creds, err := transport.Creds(ctx, o...) + if err != nil { + return nil, fmt.Errorf("fetching creds: %v", err) + } + + if creds.ProjectID == "" { + return nil, errors.New("datastore: see the docs on DetectProjectID") + } + + projectID = creds.ProjectID + } + + if projectID == "" { + return nil, errors.New("datastore: missing project/dataset id") + } + conn, err := gtransport.Dial(ctx, o...) + if err != nil { + return nil, fmt.Errorf("dialing: %v", err) + } + return &Client{ + conn: conn, + client: newDatastoreClient(conn, projectID), + dataset: projectID, + }, nil +} + +var ( + // ErrInvalidEntityType is returned when functions like Get or Next are + // passed a dst or src argument of invalid type. + ErrInvalidEntityType = errors.New("datastore: invalid entity type") + // ErrInvalidKey is returned when an invalid key is presented. + ErrInvalidKey = errors.New("datastore: invalid key") + // ErrNoSuchEntity is returned when no entity was found for a given key. + ErrNoSuchEntity = errors.New("datastore: no such entity") +) + +type multiArgType int + +const ( + multiArgTypeInvalid multiArgType = iota + multiArgTypePropertyLoadSaver + multiArgTypeStruct + multiArgTypeStructPtr + multiArgTypeInterface +) + +// ErrFieldMismatch is returned when a field is to be loaded into a different +// type than the one it was stored from, or when a field is missing or +// unexported in the destination struct. +// StructType is the type of the struct pointed to by the destination argument +// passed to Get or to Iterator.Next. +type ErrFieldMismatch struct { + StructType reflect.Type + FieldName string + Reason string +} + +func (e *ErrFieldMismatch) Error() string { + return fmt.Sprintf("datastore: cannot load field %q into a %q: %s", + e.FieldName, e.StructType, e.Reason) +} + +// GeoPoint represents a location as latitude/longitude in degrees. +type GeoPoint struct { + Lat, Lng float64 +} + +// Valid returns whether a GeoPoint is within [-90, 90] latitude and [-180, 180] longitude. +func (g GeoPoint) Valid() bool { + return -90 <= g.Lat && g.Lat <= 90 && -180 <= g.Lng && g.Lng <= 180 +} + +func keyToProto(k *Key) *pb.Key { + if k == nil { + return nil + } + + var path []*pb.Key_PathElement + for { + el := &pb.Key_PathElement{Kind: k.Kind} + if k.ID != 0 { + el.IdType = &pb.Key_PathElement_Id{Id: k.ID} + } else if k.Name != "" { + el.IdType = &pb.Key_PathElement_Name{Name: k.Name} + } + path = append(path, el) + if k.Parent == nil { + break + } + k = k.Parent + } + + // The path should be in order [grandparent, parent, child] + // We did it backward above, so reverse back. + for i := 0; i < len(path)/2; i++ { + path[i], path[len(path)-i-1] = path[len(path)-i-1], path[i] + } + + key := &pb.Key{Path: path} + if k.Namespace != "" { + key.PartitionId = &pb.PartitionId{ + NamespaceId: k.Namespace, + } + } + return key +} + +// protoToKey decodes a protocol buffer representation of a key into an +// equivalent *Key object. If the key is invalid, protoToKey will return the +// invalid key along with ErrInvalidKey. +func protoToKey(p *pb.Key) (*Key, error) { + var key *Key + var namespace string + if partition := p.PartitionId; partition != nil { + namespace = partition.NamespaceId + } + for _, el := range p.Path { + key = &Key{ + Namespace: namespace, + Kind: el.Kind, + ID: el.GetId(), + Name: el.GetName(), + Parent: key, + } + } + if !key.valid() { // Also detects key == nil. + return key, ErrInvalidKey + } + return key, nil +} + +// multiKeyToProto is a batch version of keyToProto. +func multiKeyToProto(keys []*Key) []*pb.Key { + ret := make([]*pb.Key, len(keys)) + for i, k := range keys { + ret[i] = keyToProto(k) + } + return ret +} + +// multiKeyToProto is a batch version of keyToProto. +func multiProtoToKey(keys []*pb.Key) ([]*Key, error) { + hasErr := false + ret := make([]*Key, len(keys)) + err := make(MultiError, len(keys)) + for i, k := range keys { + ret[i], err[i] = protoToKey(k) + if err[i] != nil { + hasErr = true + } + } + if hasErr { + return nil, err + } + return ret, nil +} + +// multiValid is a batch version of Key.valid. It returns an error, not a +// []bool. +func multiValid(key []*Key) error { + invalid := false + for _, k := range key { + if !k.valid() { + invalid = true + break + } + } + if !invalid { + return nil + } + err := make(MultiError, len(key)) + for i, k := range key { + if !k.valid() { + err[i] = ErrInvalidKey + } + } + return err +} + +// checkMultiArg checks that v has type []S, []*S, []I, or []P, for some struct +// type S, for some interface type I, or some non-interface non-pointer type P +// such that P or *P implements PropertyLoadSaver. +// +// It returns what category the slice's elements are, and the reflect.Type +// that represents S, I or P. +// +// As a special case, PropertyList is an invalid type for v. +func checkMultiArg(v reflect.Value) (m multiArgType, elemType reflect.Type) { + // TODO(djd): multiArg is very confusing. Fold this logic into the + // relevant Put/Get methods to make the logic less opaque. + if v.Kind() != reflect.Slice { + return multiArgTypeInvalid, nil + } + if v.Type() == typeOfPropertyList { + return multiArgTypeInvalid, nil + } + elemType = v.Type().Elem() + if reflect.PtrTo(elemType).Implements(typeOfPropertyLoadSaver) { + return multiArgTypePropertyLoadSaver, elemType + } + switch elemType.Kind() { + case reflect.Struct: + return multiArgTypeStruct, elemType + case reflect.Interface: + return multiArgTypeInterface, elemType + case reflect.Ptr: + elemType = elemType.Elem() + if elemType.Kind() == reflect.Struct { + return multiArgTypeStructPtr, elemType + } + } + return multiArgTypeInvalid, nil +} + +// Close closes the Client. +func (c *Client) Close() error { + return c.conn.Close() +} + +// Get loads the entity stored for key into dst, which must be a struct pointer +// or implement PropertyLoadSaver. If there is no such entity for the key, Get +// returns ErrNoSuchEntity. +// +// The values of dst's unmatched struct fields are not modified, and matching +// slice-typed fields are not reset before appending to them. In particular, it +// is recommended to pass a pointer to a zero valued struct on each Get call. +// +// ErrFieldMismatch is returned when a field is to be loaded into a different +// type than the one it was stored from, or when a field is missing or +// unexported in the destination struct. ErrFieldMismatch is only returned if +// dst is a struct pointer. +func (c *Client) Get(ctx context.Context, key *Key, dst interface{}) (err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.Get") + defer func() { trace.EndSpan(ctx, err) }() + + if dst == nil { // get catches nil interfaces; we need to catch nil ptr here + return ErrInvalidEntityType + } + err = c.get(ctx, []*Key{key}, []interface{}{dst}, nil) + if me, ok := err.(MultiError); ok { + return me[0] + } + return err +} + +// GetMulti is a batch version of Get. +// +// dst must be a []S, []*S, []I or []P, for some struct type S, some interface +// type I, or some non-interface non-pointer type P such that P or *P +// implements PropertyLoadSaver. If an []I, each element must be a valid dst +// for Get: it must be a struct pointer or implement PropertyLoadSaver. +// +// As a special case, PropertyList is an invalid type for dst, even though a +// PropertyList is a slice of structs. It is treated as invalid to avoid being +// mistakenly passed when []PropertyList was intended. +// +// err may be a MultiError. See ExampleMultiError to check it. +func (c *Client) GetMulti(ctx context.Context, keys []*Key, dst interface{}) (err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.GetMulti") + defer func() { trace.EndSpan(ctx, err) }() + + return c.get(ctx, keys, dst, nil) +} + +func (c *Client) get(ctx context.Context, keys []*Key, dst interface{}, opts *pb.ReadOptions) error { + v := reflect.ValueOf(dst) + multiArgType, _ := checkMultiArg(v) + + // Sanity checks + if multiArgType == multiArgTypeInvalid { + return errors.New("datastore: dst has invalid type") + } + if len(keys) != v.Len() { + return errors.New("datastore: keys and dst slices have different length") + } + if len(keys) == 0 { + return nil + } + + // Go through keys, validate them, serialize then, and create a dict mapping them to their indices. + // Equal keys are deduped. + multiErr, any := make(MultiError, len(keys)), false + keyMap := make(map[string][]int, len(keys)) + pbKeys := make([]*pb.Key, 0, len(keys)) + for i, k := range keys { + if !k.valid() { + multiErr[i] = ErrInvalidKey + any = true + } else if k.Incomplete() { + multiErr[i] = fmt.Errorf("datastore: can't get the incomplete key: %v", k) + any = true + } else { + ks := k.String() + if _, ok := keyMap[ks]; !ok { + pbKeys = append(pbKeys, keyToProto(k)) + } + keyMap[ks] = append(keyMap[ks], i) + } + } + if any { + return multiErr + } + req := &pb.LookupRequest{ + ProjectId: c.dataset, + Keys: pbKeys, + ReadOptions: opts, + } + resp, err := c.client.Lookup(ctx, req) + if err != nil { + return err + } + found := resp.Found + missing := resp.Missing + // Upper bound 100 iterations to prevent infinite loop. + // We choose 100 iterations somewhat logically: + // Max number of Entities you can request from Datastore is 1,000. + // Max size for a Datastore Entity is 1 MiB. + // Max request size is 10 MiB, so we assume max response size is also 10 MiB. + // 1,000 / 10 = 100. + // Note that if ctx has a deadline, the deadline will probably + // be hit before we reach 100 iterations. + for i := 0; len(resp.Deferred) > 0 && i < 100; i++ { + req.Keys = resp.Deferred + resp, err = c.client.Lookup(ctx, req) + if err != nil { + return err + } + found = append(found, resp.Found...) + missing = append(missing, resp.Missing...) + } + + filled := 0 + for _, e := range found { + k, err := protoToKey(e.Entity.Key) + if err != nil { + return errors.New("datastore: internal error: server returned an invalid key") + } + filled += len(keyMap[k.String()]) + for _, index := range keyMap[k.String()] { + elem := v.Index(index) + if multiArgType == multiArgTypePropertyLoadSaver || multiArgType == multiArgTypeStruct { + elem = elem.Addr() + } + if multiArgType == multiArgTypeStructPtr && elem.IsNil() { + elem.Set(reflect.New(elem.Type().Elem())) + } + if err := loadEntityProto(elem.Interface(), e.Entity); err != nil { + multiErr[index] = err + any = true + } + } + } + for _, e := range missing { + k, err := protoToKey(e.Entity.Key) + if err != nil { + return errors.New("datastore: internal error: server returned an invalid key") + } + filled += len(keyMap[k.String()]) + for _, index := range keyMap[k.String()] { + multiErr[index] = ErrNoSuchEntity + } + any = true + } + + if filled != len(keys) { + return errors.New("datastore: internal error: server returned the wrong number of entities") + } + + if any { + return multiErr + } + return nil +} + +// Put saves the entity src into the datastore with the given key. src must be +// a struct pointer or implement PropertyLoadSaver; if the struct pointer has +// any unexported fields they will be skipped. If the key is incomplete, the +// returned key will be a unique key generated by the datastore. +func (c *Client) Put(ctx context.Context, key *Key, src interface{}) (*Key, error) { + k, err := c.PutMulti(ctx, []*Key{key}, []interface{}{src}) + if err != nil { + if me, ok := err.(MultiError); ok { + return nil, me[0] + } + return nil, err + } + return k[0], nil +} + +// PutMulti is a batch version of Put. +// +// src must satisfy the same conditions as the dst argument to GetMulti. +// err may be a MultiError. See ExampleMultiError to check it. +func (c *Client) PutMulti(ctx context.Context, keys []*Key, src interface{}) (ret []*Key, err error) { + // TODO(jba): rewrite in terms of Mutate. + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.PutMulti") + defer func() { trace.EndSpan(ctx, err) }() + + mutations, err := putMutations(keys, src) + if err != nil { + return nil, err + } + + // Make the request. + req := &pb.CommitRequest{ + ProjectId: c.dataset, + Mutations: mutations, + Mode: pb.CommitRequest_NON_TRANSACTIONAL, + } + resp, err := c.client.Commit(ctx, req) + if err != nil { + return nil, err + } + + // Copy any newly minted keys into the returned keys. + ret = make([]*Key, len(keys)) + for i, key := range keys { + if key.Incomplete() { + // This key is in the mutation results. + ret[i], err = protoToKey(resp.MutationResults[i].Key) + if err != nil { + return nil, errors.New("datastore: internal error: server returned an invalid key") + } + } else { + ret[i] = key + } + } + return ret, nil +} + +func putMutations(keys []*Key, src interface{}) ([]*pb.Mutation, error) { + v := reflect.ValueOf(src) + multiArgType, _ := checkMultiArg(v) + if multiArgType == multiArgTypeInvalid { + return nil, errors.New("datastore: src has invalid type") + } + if len(keys) != v.Len() { + return nil, errors.New("datastore: key and src slices have different length") + } + if len(keys) == 0 { + return nil, nil + } + if err := multiValid(keys); err != nil { + return nil, err + } + mutations := make([]*pb.Mutation, 0, len(keys)) + multiErr := make(MultiError, len(keys)) + hasErr := false + for i, k := range keys { + elem := v.Index(i) + // Two cases where we need to take the address: + // 1) multiArgTypePropertyLoadSaver => &elem implements PLS + // 2) multiArgTypeStruct => saveEntity needs *struct + if multiArgType == multiArgTypePropertyLoadSaver || multiArgType == multiArgTypeStruct { + elem = elem.Addr() + } + p, err := saveEntity(k, elem.Interface()) + if err != nil { + multiErr[i] = err + hasErr = true + } + var mut *pb.Mutation + if k.Incomplete() { + mut = &pb.Mutation{Operation: &pb.Mutation_Insert{Insert: p}} + } else { + mut = &pb.Mutation{Operation: &pb.Mutation_Upsert{Upsert: p}} + } + mutations = append(mutations, mut) + } + if hasErr { + return nil, multiErr + } + return mutations, nil +} + +// Delete deletes the entity for the given key. +func (c *Client) Delete(ctx context.Context, key *Key) error { + err := c.DeleteMulti(ctx, []*Key{key}) + if me, ok := err.(MultiError); ok { + return me[0] + } + return err +} + +// DeleteMulti is a batch version of Delete. +// +// err may be a MultiError. See ExampleMultiError to check it. +func (c *Client) DeleteMulti(ctx context.Context, keys []*Key) (err error) { + // TODO(jba): rewrite in terms of Mutate. + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.DeleteMulti") + defer func() { trace.EndSpan(ctx, err) }() + + mutations, err := deleteMutations(keys) + if err != nil { + return err + } + + req := &pb.CommitRequest{ + ProjectId: c.dataset, + Mutations: mutations, + Mode: pb.CommitRequest_NON_TRANSACTIONAL, + } + _, err = c.client.Commit(ctx, req) + return err +} + +func deleteMutations(keys []*Key) ([]*pb.Mutation, error) { + mutations := make([]*pb.Mutation, 0, len(keys)) + set := make(map[string]bool, len(keys)) + multiErr := make(MultiError, len(keys)) + hasErr := false + for i, k := range keys { + if !k.valid() { + multiErr[i] = ErrInvalidKey + hasErr = true + } else if k.Incomplete() { + multiErr[i] = fmt.Errorf("datastore: can't delete the incomplete key: %v", k) + hasErr = true + } else { + ks := k.String() + if !set[ks] { + mutations = append(mutations, &pb.Mutation{ + Operation: &pb.Mutation_Delete{Delete: keyToProto(k)}, + }) + } + set[ks] = true + } + } + if hasErr { + return nil, multiErr + } + return mutations, nil +} + +// Mutate applies one or more mutations atomically. +// It returns the keys of the argument Mutations, in the same order. +// +// If any of the mutations are invalid, Mutate returns a MultiError with the errors. +// Mutate returns a MultiError in this case even if there is only one Mutation. +// See ExampleMultiError to check it. +func (c *Client) Mutate(ctx context.Context, muts ...*Mutation) (ret []*Key, err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.Mutate") + defer func() { trace.EndSpan(ctx, err) }() + + pmuts, err := mutationProtos(muts) + if err != nil { + return nil, err + } + req := &pb.CommitRequest{ + ProjectId: c.dataset, + Mutations: pmuts, + Mode: pb.CommitRequest_NON_TRANSACTIONAL, + } + resp, err := c.client.Commit(ctx, req) + if err != nil { + return nil, err + } + // Copy any newly minted keys into the returned keys. + ret = make([]*Key, len(muts)) + for i, mut := range muts { + if mut.key.Incomplete() { + // This key is in the mutation results. + ret[i], err = protoToKey(resp.MutationResults[i].Key) + if err != nil { + return nil, errors.New("datastore: internal error: server returned an invalid key") + } + } else { + ret[i] = mut.key + } + } + return ret, nil +} diff --git a/vendor/cloud.google.com/go/datastore/datastore.replay b/vendor/cloud.google.com/go/datastore/datastore.replay new file mode 100644 index 0000000000000000000000000000000000000000..bc38d3e85d4886726df39a26a4ff17dbbd0f8781 GIT binary patch literal 3783246 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

=PKj2|&Gl;P{Gw}c= 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%0AsEm_{wDxcD*_0Xmk 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 E1N~64$^ZZW literal 0 HcmV?d00001 diff --git a/vendor/cloud.google.com/go/datastore/doc.go b/vendor/cloud.google.com/go/datastore/doc.go new file mode 100644 index 000000000000..7cf890f039c4 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/doc.go @@ -0,0 +1,497 @@ +// Copyright 2016 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/* +Package datastore provides a client for Google Cloud Datastore. + +See https://godoc.org/cloud.google.com/go for authentication, timeouts, +connection pooling and similar aspects of this package. + + +Basic Operations + +Entities are the unit of storage and are associated with a key. A key +consists of an optional parent key, a string application ID, a string kind +(also known as an entity type), and either a StringID or an IntID. A +StringID is also known as an entity name or key name. + +It is valid to create a key with a zero StringID and a zero IntID; this is +called an incomplete key, and does not refer to any saved entity. Putting an +entity into the datastore under an incomplete key will cause a unique key +to be generated for that entity, with a non-zero IntID. + +An entity's contents are a mapping from case-sensitive field names to values. +Valid value types are: + - Signed integers (int, int8, int16, int32 and int64) + - bool + - string + - float32 and float64 + - []byte (up to 1 megabyte in length) + - Any type whose underlying type is one of the above predeclared types + - *Key + - GeoPoint + - time.Time (stored with microsecond precision, retrieved as local time) + - Structs whose fields are all valid value types + - Pointers to structs whose fields are all valid value types + - Slices of any of the above + - Pointers to a signed integer, bool, string, float32, or float64 + +Slices of structs are valid, as are structs that contain slices. + +The Get and Put functions load and save an entity's contents. An entity's +contents are typically represented by a struct pointer. + +Example code: + + type Entity struct { + Value string + } + + func main() { + ctx := context.Background() + + // Create a datastore client. In a typical application, you would create + // a single client which is reused for every datastore operation. + dsClient, err := datastore.NewClient(ctx, "my-project") + if err != nil { + // Handle error. + } + + k := datastore.NameKey("Entity", "stringID", nil) + e := new(Entity) + if err := dsClient.Get(ctx, k, e); err != nil { + // Handle error. + } + + old := e.Value + e.Value = "Hello World!" + + if _, err := dsClient.Put(ctx, k, e); err != nil { + // Handle error. + } + + fmt.Printf("Updated value from %q to %q\n", old, e.Value) + } + +GetMulti, PutMulti and DeleteMulti are batch versions of the Get, Put and +Delete functions. They take a []*Key instead of a *Key, and may return a +datastore.MultiError when encountering partial failure. + +Mutate generalizes PutMulti and DeleteMulti to a sequence of any Datastore mutations. +It takes a series of mutations created with NewInsert, NewUpdate, NewUpsert and +NewDelete and applies them atomically. + + +Properties + +An entity's contents can be represented by a variety of types. These are +typically struct pointers, but can also be any type that implements the +PropertyLoadSaver interface. If using a struct pointer, you do not have to +explicitly implement the PropertyLoadSaver interface; the datastore will +automatically convert via reflection. If a struct pointer does implement +PropertyLoadSaver then those methods will be used in preference to the default +behavior for struct pointers. Struct pointers are more strongly typed and are +easier to use; PropertyLoadSavers are more flexible. + +The actual types passed do not have to match between Get and Put calls or even +across different calls to datastore. It is valid to put a *PropertyList and +get that same entity as a *myStruct, or put a *myStruct0 and get a *myStruct1. +Conceptually, any entity is saved as a sequence of properties, and is loaded +into the destination value on a property-by-property basis. When loading into +a struct pointer, an entity that cannot be completely represented (such as a +missing field) will result in an ErrFieldMismatch error but it is up to the +caller whether this error is fatal, recoverable or ignorable. + +By default, for struct pointers, all properties are potentially indexed, and +the property name is the same as the field name (and hence must start with an +upper case letter). + +Fields may have a `datastore:"name,options"` tag. The tag name is the +property name, which must be one or more valid Go identifiers joined by ".", +but may start with a lower case letter. An empty tag name means to just use the +field name. A "-" tag name means that the datastore will ignore that field. + +The only valid options are "omitempty", "noindex" and "flatten". + +If the options include "omitempty" and the value of the field is a zero value, +then the field will be omitted on Save. Zero values are best defined in the +golang spec (https://golang.org/ref/spec#The_zero_value). Struct field values +will never be empty, except for nil pointers. + +If options include "noindex" then the field will not be indexed. All fields +are indexed by default. Strings or byte slices longer than 1500 bytes cannot +be indexed; fields used to store long strings and byte slices must be tagged +with "noindex" or they will cause Put operations to fail. + +For a nested struct field, the options may also include "flatten". This +indicates that the immediate fields and any nested substruct fields of the +nested struct should be flattened. See below for examples. + +To use multiple options together, separate them by a comma. +The order does not matter. + +If the options is "" then the comma may be omitted. + +Example code: + + // A and B are renamed to a and b. + // A, C and J are not indexed. + // D's tag is equivalent to having no tag at all (E). + // I is ignored entirely by the datastore. + // J has tag information for both the datastore and json packages. + type TaggedStruct struct { + A int `datastore:"a,noindex"` + B int `datastore:"b"` + C int `datastore:",noindex"` + D int `datastore:""` + E int + I int `datastore:"-"` + J int `datastore:",noindex" json:"j"` + } + + +Slice Fields + +A field of slice type corresponds to a Datastore array property, except for []byte, which corresponds +to a Datastore blob. + +Zero-length slice fields are not saved. Slice fields of length 1 or greater are saved +as Datastore arrays. When a zero-length Datastore array is loaded into a slice field, +the slice field remains unchanged. + +If a non-array value is loaded into a slice field, the result will be a slice with +one element, containing the value. + +Loading Nulls + +Loading a Datastore Null into a basic type (int, float, etc.) results in a zero value. +Loading a Null into a slice of basic type results in a slice of size 1 containing the zero value. +Loading a Null into a pointer field results in nil. +Loading a Null into a field of struct type is an error. + +Pointer Fields + +A struct field can be a pointer to a signed integer, floating-point number, string or +bool. Putting a non-nil pointer will store its dereferenced value. Putting a nil +pointer will store a Datastore Null property, unless the field is marked omitempty, +in which case no property will be stored. + +Loading a Null into a pointer field sets the pointer to nil. Loading any other value +allocates new storage with the value, and sets the field to point to it. + + +Key Field + +If the struct contains a *datastore.Key field tagged with the name "__key__", +its value will be ignored on Put. When reading the Entity back into the Go struct, +the field will be populated with the *datastore.Key value used to query for +the Entity. + +Example code: + + type MyEntity struct { + A int + K *datastore.Key `datastore:"__key__"` + } + + func main() { + ctx := context.Background() + dsClient, err := datastore.NewClient(ctx, "my-project") + if err != nil { + // Handle error. + } + + k := datastore.NameKey("Entity", "stringID", nil) + e := MyEntity{A: 12} + if _, err := dsClient.Put(ctx, k, &e); err != nil { + // Handle error. + } + + var entities []MyEntity + q := datastore.NewQuery("Entity").Filter("A =", 12).Limit(1) + if _, err := dsClient.GetAll(ctx, q, &entities); err != nil { + // Handle error + } + + log.Println(entities[0]) + // Prints {12 /Entity,stringID} + } + + + +Structured Properties + +If the struct pointed to contains other structs, then the nested or embedded +structs are themselves saved as Entity values. For example, given these definitions: + + type Inner struct { + W int32 + X string + } + + type Outer struct { + I Inner + } + +then an Outer would have one property, Inner, encoded as an Entity value. + +If an outer struct is tagged "noindex" then all of its implicit flattened +fields are effectively "noindex". + +If the Inner struct contains a *Key field with the name "__key__", like so: + + type Inner struct { + W int32 + X string + K *datastore.Key `datastore:"__key__"` + } + + type Outer struct { + I Inner + } + +then the value of K will be used as the Key for Inner, represented +as an Entity value in datastore. + +If any nested struct fields should be flattened, instead of encoded as +Entity values, the nested struct field should be tagged with the "flatten" +option. For example, given the following: + + type Inner1 struct { + W int32 + X string + } + + type Inner2 struct { + Y float64 + } + + type Inner3 struct { + Z bool + } + + type Inner4 struct { + WW int + } + + type Inner5 struct { + X Inner4 + } + + type Outer struct { + A int16 + I []Inner1 `datastore:",flatten"` + J Inner2 `datastore:",flatten"` + K Inner5 `datastore:",flatten"` + Inner3 `datastore:",flatten"` + } + +an Outer's properties would be equivalent to those of: + + type OuterEquivalent struct { + A int16 + IDotW []int32 `datastore:"I.W"` + IDotX []string `datastore:"I.X"` + JDotY float64 `datastore:"J.Y"` + KDotXDotWW int `datastore:"K.X.WW"` + Z bool + } + +Note that the "flatten" option cannot be used for Entity value fields or +PropertyLoadSaver implementers. The server will reject any dotted field names +for an Entity value. + + +The PropertyLoadSaver Interface + +An entity's contents can also be represented by any type that implements the +PropertyLoadSaver interface. This type may be a struct pointer, but it does +not have to be. The datastore package will call Load when getting the entity's +contents, and Save when putting the entity's contents. +Possible uses include deriving non-stored fields, verifying fields, or indexing +a field only if its value is positive. + +Example code: + + type CustomPropsExample struct { + I, J int + // Sum is not stored, but should always be equal to I + J. + Sum int `datastore:"-"` + } + + func (x *CustomPropsExample) Load(ps []datastore.Property) error { + // Load I and J as usual. + if err := datastore.LoadStruct(x, ps); err != nil { + return err + } + // Derive the Sum field. + x.Sum = x.I + x.J + return nil + } + + func (x *CustomPropsExample) Save() ([]datastore.Property, error) { + // Validate the Sum field. + if x.Sum != x.I + x.J { + return nil, errors.New("CustomPropsExample has inconsistent sum") + } + // Save I and J as usual. The code below is equivalent to calling + // "return datastore.SaveStruct(x)", but is done manually for + // demonstration purposes. + return []datastore.Property{ + { + Name: "I", + Value: int64(x.I), + }, + { + Name: "J", + Value: int64(x.J), + }, + }, nil + } + +The *PropertyList type implements PropertyLoadSaver, and can therefore hold an +arbitrary entity's contents. + +The KeyLoader Interface + +If a type implements the PropertyLoadSaver interface, it may +also want to implement the KeyLoader interface. +The KeyLoader interface exists to allow implementations of PropertyLoadSaver +to also load an Entity's Key into the Go type. This type may be a struct +pointer, but it does not have to be. The datastore package will call LoadKey +when getting the entity's contents, after calling Load. + +Example code: + + type WithKeyExample struct { + I int + Key *datastore.Key + } + + func (x *WithKeyExample) LoadKey(k *datastore.Key) error { + x.Key = k + return nil + } + + func (x *WithKeyExample) Load(ps []datastore.Property) error { + // Load I as usual. + return datastore.LoadStruct(x, ps) + } + + func (x *WithKeyExample) Save() ([]datastore.Property, error) { + // Save I as usual. + return datastore.SaveStruct(x) + } + +To load a Key into a struct which does not implement the PropertyLoadSaver +interface, see the "Key Field" section above. + + +Queries + +Queries retrieve entities based on their properties or key's ancestry. Running +a query yields an iterator of results: either keys or (key, entity) pairs. +Queries are re-usable and it is safe to call Query.Run from concurrent +goroutines. Iterators are not safe for concurrent use. + +Queries are immutable, and are either created by calling NewQuery, or derived +from an existing query by calling a method like Filter or Order that returns a +new query value. A query is typically constructed by calling NewQuery followed +by a chain of zero or more such methods. These methods are: + - Ancestor and Filter constrain the entities returned by running a query. + - Order affects the order in which they are returned. + - Project constrains the fields returned. + - Distinct de-duplicates projected entities. + - KeysOnly makes the iterator return only keys, not (key, entity) pairs. + - Start, End, Offset and Limit define which sub-sequence of matching entities + to return. Start and End take cursors, Offset and Limit take integers. Start + and Offset affect the first result, End and Limit affect the last result. + If both Start and Offset are set, then the offset is relative to Start. + If both End and Limit are set, then the earliest constraint wins. Limit is + relative to Start+Offset, not relative to End. As a special case, a + negative limit means unlimited. + +Example code: + + type Widget struct { + Description string + Price int + } + + func printWidgets(ctx context.Context, client *datastore.Client) { + q := datastore.NewQuery("Widget"). + Filter("Price <", 1000). + Order("-Price") + + t := client.Run(ctx, q) + for { + var x Widget + key, err := t.Next(&x) + if err == iterator.Done { + break + } + if err != nil { + // Handle error. + } + fmt.Printf("Key=%v\nWidget=%#v\n\n", key, x) + } + } + + +Transactions + +Client.RunInTransaction runs a function in a transaction. + +Example code: + + type Counter struct { + Count int + } + + func incCount(ctx context.Context, client *datastore.Client) { + var count int + key := datastore.NameKey("Counter", "singleton", nil) + _, err := client.RunInTransaction(ctx, func(tx *datastore.Transaction) error { + var x Counter + if err := tx.Get(key, &x); err != nil && err != datastore.ErrNoSuchEntity { + return err + } + x.Count++ + if _, err := tx.Put(key, &x); err != nil { + return err + } + count = x.Count + return nil + }) + if err != nil { + // Handle error. + } + // The value of count is only valid once the transaction is successful + // (RunInTransaction has returned nil). + fmt.Printf("Count=%d\n", count) + } + +Pass the ReadOnly option to RunInTransaction if your transaction is used only for Get, +GetMulti or queries. Read-only transactions are more efficient. + +Google Cloud Datastore Emulator + +This package supports the Cloud Datastore emulator, which is useful for testing and +development. Environment variables are used to indicate that datastore traffic should be +directed to the emulator instead of the production Datastore service. + +To install and set up the emulator and its environment variables, see the documentation +at https://cloud.google.com/datastore/docs/tools/datastore-emulator. +*/ +package datastore // import "cloud.google.com/go/datastore" diff --git a/vendor/cloud.google.com/go/datastore/errors.go b/vendor/cloud.google.com/go/datastore/errors.go new file mode 100644 index 000000000000..ee1f0022145b --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/errors.go @@ -0,0 +1,47 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file provides error functions for common API failure modes. + +package datastore + +import ( + "fmt" +) + +// MultiError is returned by batch operations when there are errors with +// particular elements. Errors will be in a one-to-one correspondence with +// the input elements; successful elements will have a nil entry. +type MultiError []error + +func (m MultiError) Error() string { + s, n := "", 0 + for _, e := range m { + if e != nil { + if n == 0 { + s = e.Error() + } + n++ + } + } + switch n { + case 0: + return "(0 errors)" + case 1: + return s + case 2: + return s + " (and 1 other error)" + } + return fmt.Sprintf("%s (and %d other errors)", s, n-1) +} diff --git a/vendor/cloud.google.com/go/datastore/go.mod b/vendor/cloud.google.com/go/datastore/go.mod new file mode 100644 index 000000000000..c05506d5548d --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/go.mod @@ -0,0 +1,15 @@ +module cloud.google.com/go/datastore + +go 1.9 + +require ( + cloud.google.com/go v0.44.1 + github.com/golang/protobuf v1.3.2 + github.com/google/go-cmp v0.3.0 + github.com/googleapis/gax-go/v2 v2.0.5 + golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 // indirect + google.golang.org/api v0.7.0 + google.golang.org/appengine v1.6.1 // indirect + google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 + google.golang.org/grpc v1.21.1 +) diff --git a/vendor/cloud.google.com/go/datastore/go.sum b/vendor/cloud.google.com/go/datastore/go.sum new file mode 100644 index 000000000000..b0be1069457c --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/go.sum @@ -0,0 +1,116 @@ +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.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= +cloud.google.com/go/logging v1.0.0/go.mod h1:V1cc3ogwobYzQq5f2R7DS/GvRIrI4FKj01Gs5glwAls= +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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +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 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +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/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +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/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +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-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 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +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/sys v0.0.0-20180830151530-49385e6e1522/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 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +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-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-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-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0 h1:9sdfJOzWlkqPltHAuzT2Cp+yrBeY1KRVYgms8soxMwM= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +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 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= +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-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 h1:iKtrH9Y8mcbADOP0YFaEMth7OfuHY9xHOwNj4znpM1A= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +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 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +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= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/cloud.google.com/go/datastore/go_mod_tidy_hack.go b/vendor/cloud.google.com/go/datastore/go_mod_tidy_hack.go new file mode 100644 index 000000000000..376c51850677 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/go_mod_tidy_hack.go @@ -0,0 +1,22 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the cloud.google.com/go import, won't actually become part of +// the resultant binary. +// +build modhack + +package datastore + +// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "cloud.google.com/go" diff --git a/vendor/cloud.google.com/go/datastore/internal/gaepb/datastore_v3.pb.go b/vendor/cloud.google.com/go/datastore/internal/gaepb/datastore_v3.pb.go new file mode 100644 index 000000000000..b3c937cefb70 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/internal/gaepb/datastore_v3.pb.go @@ -0,0 +1,432 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package gaepb is a subset of protobufs, copied from google.golang.org/appengine/internal/datastore. +// It includes the Reference, Path, and Path_Element protos. +// +// They are copied here to provide compatibility to decode keys generated by the google.golang.org/appengine/datastore package. +// Copying the minimal amount of protos to support key decoding means we don't need to add a dependency on the appengine/datastore package. +package gaepb + +import "github.com/golang/protobuf/proto" + +type Path struct { + Element []*Path_Element `protobuf:"group,1,rep,name=Element,json=element" json:"element,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Path) Reset() { *m = Path{} } +func (m *Path) String() string { return proto.CompactTextString(m) } +func (*Path) ProtoMessage() {} +func (*Path) Descriptor() ([]byte, []int) { + return fileDescriptor_datastore_v3_83b17b80c34f6179, []int{3} +} +func (m *Path) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Path.Unmarshal(m, b) +} +func (m *Path) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Path.Marshal(b, m, deterministic) +} +func (dst *Path) XXX_Merge(src proto.Message) { + xxx_messageInfo_Path.Merge(dst, src) +} +func (m *Path) XXX_Size() int { + return xxx_messageInfo_Path.Size(m) +} +func (m *Path) XXX_DiscardUnknown() { + xxx_messageInfo_Path.DiscardUnknown(m) +} + +var xxx_messageInfo_Path proto.InternalMessageInfo + +func (m *Path) GetElement() []*Path_Element { + if m != nil { + return m.Element + } + return nil +} + +type Path_Element struct { + Type *string `protobuf:"bytes,2,req,name=type" json:"type,omitempty"` + Id *int64 `protobuf:"varint,3,opt,name=id" json:"id,omitempty"` + Name *string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Path_Element) Reset() { *m = Path_Element{} } +func (m *Path_Element) String() string { return proto.CompactTextString(m) } +func (*Path_Element) ProtoMessage() {} +func (*Path_Element) Descriptor() ([]byte, []int) { + return fileDescriptor_datastore_v3_83b17b80c34f6179, []int{3, 0} +} +func (m *Path_Element) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Path_Element.Unmarshal(m, b) +} +func (m *Path_Element) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Path_Element.Marshal(b, m, deterministic) +} +func (dst *Path_Element) XXX_Merge(src proto.Message) { + xxx_messageInfo_Path_Element.Merge(dst, src) +} +func (m *Path_Element) XXX_Size() int { + return xxx_messageInfo_Path_Element.Size(m) +} +func (m *Path_Element) XXX_DiscardUnknown() { + xxx_messageInfo_Path_Element.DiscardUnknown(m) +} + +var xxx_messageInfo_Path_Element proto.InternalMessageInfo + +func (m *Path_Element) GetType() string { + if m != nil && m.Type != nil { + return *m.Type + } + return "" +} + +func (m *Path_Element) GetId() int64 { + if m != nil && m.Id != nil { + return *m.Id + } + return 0 +} + +func (m *Path_Element) GetName() string { + if m != nil && m.Name != nil { + return *m.Name + } + return "" +} + +type Reference struct { + App *string `protobuf:"bytes,13,req,name=app" json:"app,omitempty"` + NameSpace *string `protobuf:"bytes,20,opt,name=name_space,json=nameSpace" json:"name_space,omitempty"` + Path *Path `protobuf:"bytes,14,req,name=path" json:"path,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Reference) Reset() { *m = Reference{} } +func (m *Reference) String() string { return proto.CompactTextString(m) } +func (*Reference) ProtoMessage() {} +func (*Reference) Descriptor() ([]byte, []int) { + return fileDescriptor_datastore_v3_83b17b80c34f6179, []int{4} +} +func (m *Reference) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Reference.Unmarshal(m, b) +} +func (m *Reference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Reference.Marshal(b, m, deterministic) +} +func (dst *Reference) XXX_Merge(src proto.Message) { + xxx_messageInfo_Reference.Merge(dst, src) +} +func (m *Reference) XXX_Size() int { + return xxx_messageInfo_Reference.Size(m) +} +func (m *Reference) XXX_DiscardUnknown() { + xxx_messageInfo_Reference.DiscardUnknown(m) +} + +var xxx_messageInfo_Reference proto.InternalMessageInfo + +func (m *Reference) GetApp() string { + if m != nil && m.App != nil { + return *m.App + } + return "" +} + +func (m *Reference) GetNameSpace() string { + if m != nil && m.NameSpace != nil { + return *m.NameSpace + } + return "" +} + +func (m *Reference) GetPath() *Path { + if m != nil { + return m.Path + } + return nil +} + +var fileDescriptor_datastore_v3_83b17b80c34f6179 = []byte{ + // 4156 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x73, 0xe3, 0x46, + 0x76, 0x37, 0xc1, 0xef, 0x47, 0x89, 0x82, 0x5a, 0xf3, 0xc1, 0xa1, 0x3f, 0x46, 0xc6, 0xac, 0x6d, + 0xd9, 0x6b, 0x73, 0x6c, 0xf9, 0x23, 0x5b, 0x4a, 0x76, 0x1d, 0x4a, 0xc4, 0x68, 0x90, 0xa1, 0x48, + 0xb9, 0x09, 0xd9, 0x9e, 0x5c, 0x50, 0x18, 0xa2, 0x29, 0x21, 0x43, 0x02, 0x30, 0x00, 0x6a, 0x46, + 0x93, 0xe4, 0x90, 0x4b, 0x2a, 0x55, 0x5b, 0xa9, 0x1c, 0x92, 0x4a, 0x25, 0xf9, 0x07, 0x72, 0xc8, + 0x39, 0x95, 0xaa, 0x54, 0xf6, 0x98, 0x5b, 0x0e, 0x7b, 0xc9, 0x31, 0x95, 0x73, 0xf2, 0x27, 0x24, + 0x39, 0xa4, 0xfa, 0x75, 0x03, 0x02, 0x28, 0x4a, 0x23, 0x6d, 0xf6, 0x90, 0x13, 0xd1, 0xef, 0xfd, + 0xba, 0xf1, 0xfa, 0xf5, 0xfb, 0x6c, 0x10, 0xba, 0xc7, 0xbe, 0x7f, 0x3c, 0x65, 0x9d, 0x63, 0x7f, + 0x6a, 0x7b, 0xc7, 0x1d, 0x3f, 0x3c, 0x7e, 0x68, 0x07, 0x01, 0xf3, 0x8e, 0x5d, 0x8f, 0x3d, 0x74, + 0xbd, 0x98, 0x85, 0x9e, 0x3d, 0x7d, 0xe8, 0xd8, 0xb1, 0x1d, 0xc5, 0x7e, 0xc8, 0xce, 0x9f, 0xac, + 0xd3, 0xcf, 0x3b, 0x41, 0xe8, 0xc7, 0x3e, 0xa9, 0xa7, 0x13, 0xb4, 0x1a, 0x54, 0xba, 0xe3, 0xd8, + 0xf5, 0x3d, 0xed, 0x1f, 0x2b, 0xb0, 0x7a, 0x18, 0xfa, 0x01, 0x0b, 0xe3, 0xb3, 0x6f, 0xed, 0xe9, + 0x9c, 0x91, 0x77, 0x00, 0x5c, 0x2f, 0xfe, 0xea, 0x0b, 0x1c, 0xb5, 0x0a, 0x9b, 0x85, 0xad, 0x22, + 0xcd, 0x50, 0x88, 0x06, 0x2b, 0xcf, 0x7c, 0x7f, 0xca, 0x6c, 0x4f, 0x20, 0x94, 0xcd, 0xc2, 0x56, + 0x8d, 0xe6, 0x68, 0x64, 0x13, 0x1a, 0x51, 0x1c, 0xba, 0xde, 0xb1, 0x80, 0x14, 0x37, 0x0b, 0x5b, + 0x75, 0x9a, 0x25, 0x71, 0x84, 0xe3, 0xcf, 0x9f, 0x4d, 0x99, 0x40, 0x94, 0x36, 0x0b, 0x5b, 0x05, + 0x9a, 0x25, 0x91, 0x3d, 0x80, 0xc0, 0x77, 0xbd, 0xf8, 0x14, 0x01, 0xe5, 0xcd, 0xc2, 0x16, 0x6c, + 0x3f, 0xe8, 0xa4, 0x7b, 0xe8, 0xe4, 0xa4, 0xee, 0x1c, 0x72, 0x28, 0x3e, 0xd2, 0xcc, 0x34, 0xf2, + 0xdb, 0x50, 0x9f, 0x47, 0x2c, 0x14, 0x6b, 0xd4, 0x70, 0x0d, 0xed, 0xd2, 0x35, 0x8e, 0x22, 0x16, + 0x8a, 0x25, 0xce, 0x27, 0x91, 0x21, 0x34, 0x43, 0x36, 0x61, 0x21, 0xf3, 0xc6, 0x4c, 0x2c, 0xb3, + 0x82, 0xcb, 0x7c, 0x70, 0xe9, 0x32, 0x34, 0x81, 0x8b, 0xb5, 0x16, 0xa6, 0xb7, 0xb7, 0x00, 0xce, + 0x85, 0x25, 0x2b, 0x50, 0x78, 0xd9, 0xaa, 0x6c, 0x2a, 0x5b, 0x05, 0x5a, 0x78, 0xc9, 0x47, 0x67, + 0xad, 0xaa, 0x18, 0x9d, 0xb5, 0xff, 0xa9, 0x00, 0xf5, 0x54, 0x26, 0x72, 0x0b, 0xca, 0x6c, 0x66, + 0xbb, 0xd3, 0x56, 0x7d, 0x53, 0xd9, 0xaa, 0x53, 0x31, 0x20, 0xf7, 0xa1, 0x61, 0xcf, 0xe3, 0x13, + 0xcb, 0xf1, 0x67, 0xb6, 0xeb, 0xb5, 0x00, 0x79, 0xc0, 0x49, 0x3d, 0xa4, 0x90, 0x36, 0xd4, 0x3c, + 0x77, 0xfc, 0xdc, 0xb3, 0x67, 0xac, 0xd5, 0xc0, 0x73, 0x48, 0xc7, 0xe4, 0x13, 0x20, 0x13, 0xe6, + 0xb0, 0xd0, 0x8e, 0x99, 0x63, 0xb9, 0x0e, 0xf3, 0x62, 0x37, 0x3e, 0x6b, 0xdd, 0x46, 0xd4, 0x7a, + 0xca, 0x31, 0x24, 0x23, 0x0f, 0x0f, 0x42, 0xff, 0xd4, 0x75, 0x58, 0xd8, 0xba, 0xb3, 0x00, 0x3f, + 0x94, 0x8c, 0xf6, 0xbf, 0x17, 0xa0, 0x99, 0xd7, 0x05, 0x51, 0xa1, 0x68, 0x07, 0x41, 0x6b, 0x15, + 0xa5, 0xe4, 0x8f, 0xe4, 0x6d, 0x00, 0x2e, 0x8a, 0x15, 0x05, 0xf6, 0x98, 0xb5, 0x6e, 0xe1, 0x5a, + 0x75, 0x4e, 0x19, 0x71, 0x02, 0x39, 0x82, 0x46, 0x60, 0xc7, 0x27, 0x6c, 0xca, 0x66, 0xcc, 0x8b, + 0x5b, 0xcd, 0xcd, 0xe2, 0x16, 0x6c, 0x7f, 0x7e, 0x4d, 0xd5, 0x77, 0x0e, 0xed, 0xf8, 0x44, 0x17, + 0x53, 0x69, 0x76, 0x9d, 0xb6, 0x0e, 0x8d, 0x0c, 0x8f, 0x10, 0x28, 0xc5, 0x67, 0x01, 0x6b, 0xad, + 0xa1, 0x5c, 0xf8, 0x4c, 0x9a, 0xa0, 0xb8, 0x4e, 0x4b, 0x45, 0xf3, 0x57, 0x5c, 0x87, 0x63, 0x50, + 0x87, 0xeb, 0x28, 0x22, 0x3e, 0x6b, 0xff, 0x51, 0x86, 0x5a, 0x22, 0x00, 0xe9, 0x42, 0x75, 0xc6, + 0x6c, 0xcf, 0xf5, 0x8e, 0xd1, 0x69, 0x9a, 0xdb, 0x6f, 0x2e, 0x11, 0xb3, 0x73, 0x20, 0x20, 0x3b, + 0x30, 0x18, 0x5a, 0x07, 0x7a, 0x77, 0x60, 0x0c, 0xf6, 0x69, 0x32, 0x8f, 0x1f, 0xa6, 0x7c, 0xb4, + 0xe6, 0xa1, 0x8b, 0x9e, 0x55, 0xa7, 0x20, 0x49, 0x47, 0xa1, 0x9b, 0x0a, 0x51, 0x14, 0x82, 0xe2, + 0x21, 0x76, 0xa0, 0x9c, 0xb8, 0x88, 0xb2, 0xd5, 0xd8, 0x6e, 0x5d, 0xa6, 0x1c, 0x2a, 0x60, 0xdc, + 0x20, 0x66, 0xf3, 0x69, 0xec, 0x06, 0x53, 0xee, 0x76, 0xca, 0x56, 0x8d, 0xa6, 0x63, 0xf2, 0x1e, + 0x40, 0xc4, 0xec, 0x70, 0x7c, 0x62, 0x3f, 0x9b, 0xb2, 0x56, 0x85, 0x7b, 0xf6, 0x4e, 0x79, 0x62, + 0x4f, 0x23, 0x46, 0x33, 0x0c, 0x62, 0xc3, 0xdd, 0x49, 0x1c, 0x59, 0xb1, 0xff, 0x9c, 0x79, 0xee, + 0x2b, 0x9b, 0x07, 0x12, 0xcb, 0x0f, 0xf8, 0x0f, 0xfa, 0x58, 0x73, 0xfb, 0xc3, 0x65, 0x5b, 0x7f, + 0x14, 0x47, 0x66, 0x66, 0xc6, 0x10, 0x27, 0xd0, 0xdb, 0x93, 0x65, 0x64, 0xd2, 0x86, 0xca, 0xd4, + 0x1f, 0xdb, 0x53, 0xd6, 0xaa, 0x73, 0x2d, 0xec, 0x28, 0xcc, 0xa3, 0x92, 0xa2, 0xfd, 0xb3, 0x02, + 0x55, 0xa9, 0x47, 0xd2, 0x84, 0x8c, 0x26, 0xd5, 0x37, 0x48, 0x0d, 0x4a, 0xbb, 0xfd, 0xe1, 0xae, + 0xda, 0xe4, 0x4f, 0xa6, 0xfe, 0xbd, 0xa9, 0xae, 0x71, 0xcc, 0xee, 0x53, 0x53, 0x1f, 0x99, 0x94, + 0x63, 0x54, 0xb2, 0x0e, 0xab, 0x5d, 0x73, 0x78, 0x60, 0xed, 0x75, 0x4d, 0x7d, 0x7f, 0x48, 0x9f, + 0xaa, 0x05, 0xb2, 0x0a, 0x75, 0x24, 0xf5, 0x8d, 0xc1, 0x13, 0x55, 0xe1, 0x33, 0x70, 0x68, 0x1a, + 0x66, 0x5f, 0x57, 0x8b, 0x44, 0x85, 0x15, 0x31, 0x63, 0x38, 0x30, 0xf5, 0x81, 0xa9, 0x96, 0x52, + 0xca, 0xe8, 0xe8, 0xe0, 0xa0, 0x4b, 0x9f, 0xaa, 0x65, 0xb2, 0x06, 0x0d, 0xa4, 0x74, 0x8f, 0xcc, + 0xc7, 0x43, 0xaa, 0x56, 0x48, 0x03, 0xaa, 0xfb, 0x3d, 0xeb, 0xbb, 0xc7, 0xfa, 0x40, 0xad, 0x92, + 0x15, 0xa8, 0xed, 0xf7, 0x2c, 0xfd, 0xa0, 0x6b, 0xf4, 0xd5, 0x1a, 0x9f, 0xbd, 0xaf, 0x0f, 0xe9, + 0x68, 0x64, 0x1d, 0x0e, 0x8d, 0x81, 0xa9, 0xd6, 0x49, 0x1d, 0xca, 0xfb, 0x3d, 0xcb, 0x38, 0x50, + 0x81, 0x10, 0x68, 0xee, 0xf7, 0xac, 0xc3, 0xc7, 0xc3, 0x81, 0x3e, 0x38, 0x3a, 0xd8, 0xd5, 0xa9, + 0xda, 0x20, 0xb7, 0x40, 0xe5, 0xb4, 0xe1, 0xc8, 0xec, 0xf6, 0xbb, 0xbd, 0x1e, 0xd5, 0x47, 0x23, + 0x75, 0x85, 0x4b, 0xbd, 0xdf, 0xb3, 0x68, 0xd7, 0xe4, 0xfb, 0x5a, 0xe5, 0x2f, 0xe4, 0x7b, 0x7f, + 0xa2, 0x3f, 0x55, 0xd7, 0xf9, 0x2b, 0xf4, 0x81, 0x69, 0x98, 0x4f, 0xad, 0x43, 0x3a, 0x34, 0x87, + 0xea, 0x06, 0x17, 0xd0, 0x18, 0xf4, 0xf4, 0xef, 0xad, 0x6f, 0xbb, 0xfd, 0x23, 0x5d, 0x25, 0xda, + 0x8f, 0xe1, 0xf6, 0xd2, 0x33, 0xe1, 0xaa, 0x7b, 0x6c, 0x1e, 0xf4, 0xd5, 0x02, 0x7f, 0xe2, 0x9b, + 0x52, 0x15, 0xed, 0x0f, 0xa0, 0xc4, 0x5d, 0x86, 0x7c, 0x06, 0xd5, 0xc4, 0x1b, 0x0b, 0xe8, 0x8d, + 0x77, 0xb3, 0x67, 0x6d, 0xc7, 0x27, 0x9d, 0xc4, 0xe3, 0x12, 0x5c, 0xbb, 0x0b, 0xd5, 0x45, 0x4f, + 0x53, 0x2e, 0x78, 0x5a, 0xf1, 0x82, 0xa7, 0x95, 0x32, 0x9e, 0x66, 0x43, 0x3d, 0xf5, 0xed, 0x9b, + 0x47, 0x91, 0x07, 0x50, 0xe2, 0xde, 0xdf, 0x6a, 0xa2, 0x87, 0xac, 0x2d, 0x08, 0x4c, 0x91, 0xa9, + 0xfd, 0x43, 0x01, 0x4a, 0x3c, 0xda, 0x9e, 0x07, 0xda, 0xc2, 0x15, 0x81, 0x56, 0xb9, 0x32, 0xd0, + 0x16, 0xaf, 0x15, 0x68, 0x2b, 0x37, 0x0b, 0xb4, 0xd5, 0x4b, 0x02, 0xad, 0xf6, 0x67, 0x45, 0x68, + 0xe8, 0x38, 0xf3, 0x10, 0x13, 0xfd, 0xfb, 0x50, 0x7c, 0xce, 0xce, 0x50, 0x3f, 0x8d, 0xed, 0x5b, + 0x99, 0xdd, 0xa6, 0x2a, 0xa4, 0x1c, 0x40, 0xb6, 0x61, 0x45, 0xbc, 0xd0, 0x3a, 0x0e, 0xfd, 0x79, + 0xd0, 0x52, 0x97, 0xab, 0xa7, 0x21, 0x40, 0xfb, 0x1c, 0x43, 0xde, 0x83, 0xb2, 0xff, 0xc2, 0x63, + 0x21, 0xc6, 0xc1, 0x3c, 0x98, 0x2b, 0x8f, 0x0a, 0x2e, 0x79, 0x08, 0xa5, 0xe7, 0xae, 0xe7, 0xe0, + 0x19, 0xe6, 0x23, 0x61, 0x46, 0xd0, 0xce, 0x13, 0xd7, 0x73, 0x28, 0x02, 0xc9, 0x3d, 0xa8, 0xf1, + 0x5f, 0x8c, 0x7b, 0x65, 0xdc, 0x68, 0x95, 0x8f, 0x79, 0xd0, 0x7b, 0x08, 0xb5, 0x40, 0xc6, 0x10, + 0x4c, 0x00, 0x8d, 0xed, 0x8d, 0x25, 0xe1, 0x85, 0xa6, 0x20, 0xf2, 0x15, 0xac, 0x84, 0xf6, 0x0b, + 0x2b, 0x9d, 0xb4, 0x76, 0xf9, 0xa4, 0x46, 0x68, 0xbf, 0x48, 0x23, 0x38, 0x81, 0x52, 0x68, 0x7b, + 0xcf, 0x5b, 0x64, 0xb3, 0xb0, 0x55, 0xa6, 0xf8, 0xac, 0x7d, 0x01, 0x25, 0x2e, 0x25, 0x8f, 0x08, + 0xfb, 0x3d, 0xf4, 0xff, 0xee, 0x9e, 0xa9, 0x16, 0x12, 0x7f, 0xfe, 0x96, 0x47, 0x03, 0x45, 0x72, + 0x0f, 0xf4, 0xd1, 0xa8, 0xbb, 0xaf, 0xab, 0x45, 0xad, 0x07, 0xeb, 0x7b, 0xfe, 0x2c, 0xf0, 0x23, + 0x37, 0x66, 0xe9, 0xf2, 0xf7, 0xa0, 0xe6, 0x7a, 0x0e, 0x7b, 0x69, 0xb9, 0x0e, 0x9a, 0x56, 0x91, + 0x56, 0x71, 0x6c, 0x38, 0xdc, 0xe4, 0x4e, 0x65, 0x31, 0x55, 0xe4, 0x26, 0x87, 0x03, 0xed, 0x2f, + 0x15, 0x28, 0x1b, 0x1c, 0xc1, 0x8d, 0x4f, 0x9e, 0x14, 0x7a, 0x8f, 0x30, 0x4c, 0x10, 0x24, 0x93, + 0xfb, 0x50, 0x1b, 0x6a, 0xb6, 0x37, 0x66, 0xbc, 0xe2, 0xc3, 0x3c, 0x50, 0xa3, 0xe9, 0x98, 0x7c, + 0x99, 0xd1, 0x9f, 0x82, 0x2e, 0x7b, 0x2f, 0xa3, 0x0a, 0x7c, 0xc1, 0x12, 0x2d, 0xb6, 0xff, 0xaa, + 0x90, 0x49, 0x6e, 0xcb, 0x12, 0x4f, 0x1f, 0xea, 0x8e, 0x1b, 0x32, 0xac, 0x23, 0xe5, 0x41, 0x3f, + 0xb8, 0x74, 0xe1, 0x4e, 0x2f, 0x81, 0xee, 0xd4, 0xbb, 0xa3, 0x3d, 0x7d, 0xd0, 0xe3, 0x99, 0xef, + 0x7c, 0x01, 0xed, 0x23, 0xa8, 0xa7, 0x10, 0x0c, 0xc7, 0x09, 0x48, 0x2d, 0x70, 0xf5, 0xf6, 0xf4, + 0x74, 0xac, 0x68, 0x7f, 0xad, 0x40, 0x33, 0xd5, 0xaf, 0xd0, 0xd0, 0x6d, 0xa8, 0xd8, 0x41, 0x90, + 0xa8, 0xb6, 0x4e, 0xcb, 0x76, 0x10, 0x18, 0x8e, 0x8c, 0x2d, 0x0a, 0x6a, 0x9b, 0xc7, 0x96, 0x4f, + 0x01, 0x1c, 0x36, 0x71, 0x3d, 0x17, 0x85, 0x2e, 0xa2, 0xc1, 0xab, 0x8b, 0x42, 0xd3, 0x0c, 0x86, + 0x7c, 0x09, 0xe5, 0x28, 0xb6, 0x63, 0x91, 0x2b, 0x9b, 0xdb, 0xf7, 0x33, 0xe0, 0xbc, 0x08, 0x9d, + 0x11, 0x87, 0x51, 0x81, 0x26, 0x5f, 0xc1, 0x2d, 0xdf, 0x9b, 0x9e, 0x59, 0xf3, 0x88, 0x59, 0xee, + 0xc4, 0x0a, 0xd9, 0x0f, 0x73, 0x37, 0x64, 0x4e, 0x3e, 0xa7, 0xae, 0x73, 0xc8, 0x51, 0xc4, 0x8c, + 0x09, 0x95, 0x7c, 0xed, 0x6b, 0x28, 0xe3, 0x3a, 0x7c, 0xcf, 0xdf, 0x51, 0xc3, 0xd4, 0xad, 0xe1, + 0xa0, 0xff, 0x54, 0xe8, 0x80, 0xea, 0xdd, 0x9e, 0x85, 0x44, 0x55, 0xe1, 0xc1, 0xbe, 0xa7, 0xf7, + 0x75, 0x53, 0xef, 0xa9, 0x45, 0x9e, 0x3d, 0x74, 0x4a, 0x87, 0x54, 0x2d, 0x69, 0xff, 0x53, 0x80, + 0x15, 0x94, 0xe7, 0xd0, 0x8f, 0xe2, 0x89, 0xfb, 0x92, 0xec, 0x41, 0x43, 0x98, 0xdd, 0xa9, 0x2c, + 0xe8, 0xb9, 0x33, 0x68, 0x8b, 0x7b, 0x96, 0x68, 0x31, 0x90, 0x75, 0xb4, 0x9b, 0x3e, 0x27, 0x21, + 0x45, 0x41, 0xa7, 0xbf, 0x22, 0xa4, 0xbc, 0x05, 0x95, 0x67, 0x6c, 0xe2, 0x87, 0x22, 0x04, 0xd6, + 0x76, 0x4a, 0x71, 0x38, 0x67, 0x54, 0xd2, 0xda, 0x36, 0xc0, 0xf9, 0xfa, 0xe4, 0x01, 0xac, 0x26, + 0xc6, 0x66, 0xa1, 0x71, 0x89, 0x93, 0x5b, 0x49, 0x88, 0x83, 0x5c, 0x75, 0xa3, 0x5c, 0xab, 0xba, + 0xd1, 0xbe, 0x86, 0xd5, 0x64, 0x3f, 0xe2, 0xfc, 0x54, 0x21, 0x79, 0x01, 0x63, 0xca, 0x82, 0x8c, + 0xca, 0x45, 0x19, 0xb5, 0x9f, 0x41, 0x6d, 0xe4, 0xd9, 0x41, 0x74, 0xe2, 0xc7, 0xdc, 0x7a, 0xe2, + 0x48, 0xfa, 0xaa, 0x12, 0x47, 0x9a, 0x06, 0x15, 0x7e, 0x38, 0xf3, 0x88, 0xbb, 0xbf, 0x31, 0xe8, + 0xee, 0x99, 0xc6, 0xb7, 0xba, 0xfa, 0x06, 0x01, 0xa8, 0xc8, 0xe7, 0x82, 0xa6, 0x41, 0xd3, 0x90, + 0xed, 0xd8, 0x63, 0x66, 0x3b, 0x2c, 0xe4, 0x12, 0xfc, 0xe0, 0x47, 0x89, 0x04, 0x3f, 0xf8, 0x91, + 0xf6, 0x17, 0x05, 0x68, 0x98, 0xa1, 0xed, 0x45, 0xb6, 0x30, 0xf7, 0xcf, 0xa0, 0x72, 0x82, 0x58, + 0x74, 0xa3, 0xc6, 0x82, 0x7f, 0x66, 0x17, 0xa3, 0x12, 0x48, 0xee, 0x40, 0xe5, 0xc4, 0xf6, 0x9c, + 0xa9, 0xd0, 0x5a, 0x85, 0xca, 0x51, 0x92, 0x1b, 0x95, 0xf3, 0xdc, 0xb8, 0x05, 0x2b, 0x33, 0x3b, + 0x7c, 0x6e, 0x8d, 0x4f, 0x6c, 0xef, 0x98, 0x45, 0xf2, 0x60, 0xa4, 0x05, 0x36, 0x38, 0x6b, 0x4f, + 0x70, 0xb4, 0xbf, 0x5f, 0x81, 0xf2, 0x37, 0x73, 0x16, 0x9e, 0x65, 0x04, 0xfa, 0xe0, 0xba, 0x02, + 0xc9, 0x17, 0x17, 0x2e, 0x4b, 0xca, 0x6f, 0x2f, 0x26, 0x65, 0x22, 0x53, 0x84, 0xc8, 0x95, 0x22, + 0x0b, 0x7c, 0x9a, 0x09, 0x63, 0xeb, 0x57, 0xd8, 0xda, 0x79, 0x70, 0x7b, 0x08, 0x95, 0x89, 0x3b, + 0x8d, 0x51, 0x75, 0x8b, 0xd5, 0x08, 0xee, 0xa5, 0xf3, 0x08, 0xd9, 0x54, 0xc2, 0xc8, 0xbb, 0xb0, + 0x22, 0x2a, 0x59, 0xeb, 0x07, 0xce, 0xc6, 0x82, 0x95, 0xf7, 0xa6, 0x48, 0x13, 0xbb, 0xff, 0x18, + 0xca, 0x7e, 0xc8, 0x37, 0x5f, 0xc7, 0x25, 0xef, 0x5c, 0x58, 0x72, 0xc8, 0xb9, 0x54, 0x80, 0xc8, + 0x87, 0x50, 0x3a, 0x71, 0xbd, 0x18, 0xb3, 0x46, 0x73, 0xfb, 0xf6, 0x05, 0xf0, 0x63, 0xd7, 0x8b, + 0x29, 0x42, 0x78, 0x98, 0x1f, 0xfb, 0x73, 0x2f, 0x6e, 0xdd, 0xc5, 0x0c, 0x23, 0x06, 0xe4, 0x1e, + 0x54, 0xfc, 0xc9, 0x24, 0x62, 0x31, 0x76, 0x96, 0xe5, 0x9d, 0xc2, 0xa7, 0x54, 0x12, 0xf8, 0x84, + 0xa9, 0x3b, 0x73, 0x63, 0xec, 0x43, 0xca, 0x54, 0x0c, 0xc8, 0x2e, 0xac, 0x8d, 0xfd, 0x59, 0xe0, + 0x4e, 0x99, 0x63, 0x8d, 0xe7, 0x61, 0xe4, 0x87, 0xad, 0x77, 0x2e, 0x1c, 0xd3, 0x9e, 0x44, 0xec, + 0x21, 0x80, 0x36, 0xc7, 0xb9, 0x31, 0x31, 0x60, 0x83, 0x79, 0x8e, 0xb5, 0xb8, 0xce, 0xfd, 0xd7, + 0xad, 0xb3, 0xce, 0x3c, 0x27, 0x4f, 0x4a, 0xc4, 0xc1, 0x48, 0x68, 0x61, 0xcc, 0x68, 0x6d, 0x60, + 0x90, 0xb9, 0x77, 0x69, 0xac, 0x14, 0xe2, 0x64, 0xc2, 0xf7, 0x6f, 0xc0, 0x2d, 0x19, 0x22, 0xad, + 0x80, 0x85, 0x13, 0x36, 0x8e, 0xad, 0x60, 0x6a, 0x7b, 0x58, 0xca, 0xa5, 0xc6, 0x4a, 0x24, 0xe4, + 0x50, 0x20, 0x0e, 0xa7, 0xb6, 0x47, 0x34, 0xa8, 0x3f, 0x67, 0x67, 0x91, 0xc5, 0x23, 0x29, 0x76, + 0xae, 0x29, 0xba, 0xc6, 0xe9, 0x43, 0x6f, 0x7a, 0x46, 0x7e, 0x02, 0x8d, 0xf8, 0xdc, 0xdb, 0xb0, + 0x61, 0x6d, 0xe4, 0x4e, 0x35, 0xe3, 0x8b, 0x34, 0x0b, 0x25, 0xf7, 0xa1, 0x2a, 0x35, 0xd4, 0xba, + 0x97, 0x5d, 0x3b, 0xa1, 0xf2, 0xc4, 0x3c, 0xb1, 0xdd, 0xa9, 0x7f, 0xca, 0x42, 0x6b, 0x16, 0xb5, + 0xda, 0xe2, 0xb6, 0x24, 0x21, 0x1d, 0x44, 0xdc, 0x4f, 0xa3, 0x38, 0xf4, 0xbd, 0xe3, 0xd6, 0x26, + 0xde, 0x93, 0xc8, 0xd1, 0xc5, 0xe0, 0xf7, 0x2e, 0x66, 0xfe, 0x7c, 0xf0, 0xfb, 0x1c, 0xee, 0x60, + 0x65, 0x66, 0x3d, 0x3b, 0xb3, 0xf2, 0x68, 0x0d, 0xd1, 0x1b, 0xc8, 0xdd, 0x3d, 0x3b, 0xcc, 0x4e, + 0x6a, 0x43, 0xcd, 0x71, 0xa3, 0xd8, 0xf5, 0xc6, 0x71, 0xab, 0x85, 0xef, 0x4c, 0xc7, 0xe4, 0x33, + 0xb8, 0x3d, 0x73, 0x3d, 0x2b, 0xb2, 0x27, 0xcc, 0x8a, 0x5d, 0xee, 0x9b, 0x6c, 0xec, 0x7b, 0x4e, + 0xd4, 0x7a, 0x80, 0x82, 0x93, 0x99, 0xeb, 0x8d, 0xec, 0x09, 0x33, 0xdd, 0x19, 0x1b, 0x09, 0x0e, + 0xf9, 0x08, 0xd6, 0x11, 0x1e, 0xb2, 0x60, 0xea, 0x8e, 0x6d, 0xf1, 0xfa, 0x1f, 0xe1, 0xeb, 0xd7, + 0x38, 0x83, 0x0a, 0x3a, 0xbe, 0xfa, 0x63, 0x68, 0x06, 0x2c, 0x8c, 0xdc, 0x28, 0xb6, 0xa4, 0x45, + 0xbf, 0x97, 0xd5, 0xda, 0xaa, 0x64, 0x0e, 0x91, 0xd7, 0xfe, 0xcf, 0x02, 0x54, 0x84, 0x73, 0x92, + 0x4f, 0x41, 0xf1, 0x03, 0xbc, 0x06, 0x69, 0x6e, 0x6f, 0x5e, 0xe2, 0xc1, 0x9d, 0x61, 0xc0, 0xeb, + 0x5e, 0x3f, 0xa4, 0x8a, 0x1f, 0xdc, 0xb8, 0x28, 0xd4, 0xfe, 0x10, 0x6a, 0xc9, 0x02, 0xbc, 0xbc, + 0xe8, 0xeb, 0xa3, 0x91, 0x65, 0x3e, 0xee, 0x0e, 0xd4, 0x02, 0xb9, 0x03, 0x24, 0x1d, 0x5a, 0x43, + 0x6a, 0xe9, 0xdf, 0x1c, 0x75, 0xfb, 0xaa, 0x82, 0x5d, 0x1a, 0xd5, 0xbb, 0xa6, 0x4e, 0x05, 0xb2, + 0x48, 0xee, 0xc1, 0xed, 0x2c, 0xe5, 0x1c, 0x5c, 0xc2, 0x14, 0x8c, 0x8f, 0x65, 0x52, 0x01, 0xc5, + 0x18, 0xa8, 0x15, 0x9e, 0x16, 0xf4, 0xef, 0x8d, 0x91, 0x39, 0x52, 0xab, 0xed, 0xbf, 0x29, 0x40, + 0x19, 0xc3, 0x06, 0x3f, 0x9f, 0x54, 0x72, 0x71, 0x5d, 0x73, 0x5e, 0xb9, 0x1a, 0xd9, 0x92, 0xaa, + 0x81, 0x01, 0x65, 0x73, 0x79, 0xf4, 0xf9, 0xb5, 0xd6, 0x53, 0x3f, 0x85, 0x12, 0x8f, 0x52, 0xbc, + 0x43, 0x1c, 0xd2, 0x9e, 0x4e, 0xad, 0x47, 0x06, 0x1d, 0xf1, 0x2a, 0x97, 0x40, 0xb3, 0x3b, 0xd8, + 0xd3, 0x47, 0xe6, 0x30, 0xa1, 0xa1, 0x56, 0x1e, 0x19, 0x7d, 0x33, 0x45, 0x15, 0xb5, 0x9f, 0xd7, + 0x60, 0x35, 0x89, 0x09, 0x22, 0x82, 0x3e, 0x82, 0x46, 0x10, 0xba, 0x33, 0x3b, 0x3c, 0x8b, 0xc6, + 0xb6, 0x87, 0x49, 0x01, 0xb6, 0x7f, 0xb4, 0x24, 0xaa, 0x88, 0x1d, 0x1d, 0x0a, 0xec, 0x68, 0x6c, + 0x7b, 0x34, 0x3b, 0x91, 0xf4, 0x61, 0x75, 0xc6, 0xc2, 0x63, 0xf6, 0x7b, 0xbe, 0xeb, 0xe1, 0x4a, + 0x55, 0x8c, 0xc8, 0xef, 0x5f, 0xba, 0xd2, 0x01, 0x47, 0xff, 0x8e, 0xef, 0x7a, 0xb8, 0x56, 0x7e, + 0x32, 0xf9, 0x04, 0xea, 0xa2, 0x12, 0x72, 0xd8, 0x04, 0x63, 0xc5, 0xb2, 0xda, 0x4f, 0xd4, 0xe8, + 0x3d, 0x36, 0xc9, 0xc4, 0x65, 0xb8, 0x34, 0x2e, 0x37, 0xb2, 0x71, 0xf9, 0xcd, 0x6c, 0x2c, 0x5a, + 0x11, 0x55, 0x78, 0x1a, 0x84, 0x2e, 0x38, 0x7c, 0x6b, 0x89, 0xc3, 0x77, 0x60, 0x23, 0xf1, 0x55, + 0xcb, 0xf5, 0x26, 0xee, 0x4b, 0x2b, 0x72, 0x5f, 0x89, 0xd8, 0x53, 0xa6, 0xeb, 0x09, 0xcb, 0xe0, + 0x9c, 0x91, 0xfb, 0x8a, 0x11, 0x23, 0xe9, 0xe0, 0x64, 0x0e, 0x5c, 0xc5, 0xab, 0xc9, 0xf7, 0x2e, + 0x55, 0x8f, 0x68, 0xbe, 0x64, 0x46, 0xcc, 0x4d, 0x6d, 0xff, 0x52, 0x81, 0x46, 0xe6, 0x1c, 0x78, + 0xf6, 0x16, 0xca, 0x42, 0x61, 0xc5, 0x55, 0x94, 0x50, 0x1f, 0x4a, 0xfa, 0x26, 0xd4, 0xa3, 0xd8, + 0x0e, 0x63, 0x8b, 0x17, 0x57, 0xb2, 0xdd, 0x45, 0xc2, 0x13, 0x76, 0x46, 0x3e, 0x80, 0x35, 0xc1, + 0x74, 0xbd, 0xf1, 0x74, 0x1e, 0xb9, 0xa7, 0xa2, 0x99, 0xaf, 0xd1, 0x26, 0x92, 0x8d, 0x84, 0x4a, + 0xee, 0x42, 0x95, 0x67, 0x21, 0xbe, 0x86, 0x68, 0xfa, 0x2a, 0xcc, 0x73, 0xf8, 0x0a, 0x0f, 0x60, + 0x95, 0x33, 0xce, 0xe7, 0x57, 0xc4, 0x2d, 0x33, 0xf3, 0x9c, 0xf3, 0xd9, 0x1d, 0xd8, 0x10, 0xaf, + 0x09, 0x44, 0xf1, 0x2a, 0x2b, 0xdc, 0x3b, 0xa8, 0xd8, 0x75, 0x64, 0xc9, 0xb2, 0x56, 0x14, 0x9c, + 0x1f, 0x01, 0xcf, 0x5e, 0x0b, 0xe8, 0xbb, 0x22, 0x94, 0x31, 0xcf, 0xc9, 0x61, 0x77, 0xe1, 0x1d, + 0x8e, 0x9d, 0x7b, 0x76, 0x10, 0x4c, 0x5d, 0xe6, 0x58, 0x53, 0xff, 0x18, 0x43, 0x66, 0x14, 0xdb, + 0xb3, 0xc0, 0x9a, 0x47, 0xad, 0x0d, 0x0c, 0x99, 0x6d, 0xe6, 0x39, 0x47, 0x09, 0xa8, 0xef, 0x1f, + 0x9b, 0x09, 0xe4, 0x28, 0x6a, 0xff, 0x3e, 0xac, 0xe6, 0xec, 0x71, 0x41, 0xa7, 0x35, 0x74, 0xfe, + 0x8c, 0x4e, 0xdf, 0x85, 0x95, 0x20, 0x64, 0xe7, 0xa2, 0xd5, 0x51, 0xb4, 0x86, 0xa0, 0x09, 0xb1, + 0xb6, 0x60, 0x05, 0x79, 0x96, 0x20, 0xe6, 0xf3, 0x63, 0x03, 0x59, 0x87, 0xc8, 0x69, 0xbf, 0x80, + 0x95, 0xec, 0x69, 0x93, 0x77, 0x33, 0x69, 0xa1, 0x99, 0xcb, 0x93, 0x69, 0x76, 0x48, 0x2a, 0xb2, + 0xf5, 0x4b, 0x2a, 0x32, 0x72, 0x9d, 0x8a, 0x4c, 0xfb, 0x2f, 0xd9, 0x9c, 0x65, 0x2a, 0x84, 0x9f, + 0x41, 0x2d, 0x90, 0xf5, 0x38, 0x5a, 0x52, 0xfe, 0x12, 0x3e, 0x0f, 0xee, 0x24, 0x95, 0x3b, 0x4d, + 0xe7, 0xb4, 0xff, 0x56, 0x81, 0x5a, 0x5a, 0xd0, 0xe7, 0x2c, 0xef, 0xcd, 0x05, 0xcb, 0x3b, 0x90, + 0x1a, 0x16, 0x0a, 0x7c, 0x1b, 0xa3, 0xc5, 0x27, 0xaf, 0x7f, 0xd7, 0xc5, 0xb6, 0xe7, 0x34, 0xdb, + 0xf6, 0x6c, 0xbe, 0xae, 0xed, 0xf9, 0xe4, 0xa2, 0xc1, 0xbf, 0x95, 0xe9, 0x2d, 0x16, 0xcc, 0xbe, + 0xfd, 0x7d, 0xae, 0x0f, 0xca, 0x26, 0x84, 0x77, 0xc4, 0x7e, 0xd2, 0x84, 0x90, 0xb6, 0x3f, 0xf7, + 0xaf, 0xd7, 0xfe, 0x6c, 0x43, 0x45, 0xea, 0xfc, 0x0e, 0x54, 0x64, 0x4d, 0x27, 0x1b, 0x04, 0x31, + 0x3a, 0x6f, 0x10, 0x0a, 0xb2, 0x4e, 0xd7, 0x7e, 0xae, 0x40, 0x59, 0x0f, 0x43, 0x3f, 0xd4, 0xfe, + 0x48, 0x81, 0x3a, 0x3e, 0xed, 0xf9, 0x0e, 0xe3, 0xd9, 0x60, 0xb7, 0xdb, 0xb3, 0xa8, 0xfe, 0xcd, + 0x91, 0x8e, 0xd9, 0xa0, 0x0d, 0x77, 0xf6, 0x86, 0x83, 0xbd, 0x23, 0x4a, 0xf5, 0x81, 0x69, 0x99, + 0xb4, 0x3b, 0x18, 0xf1, 0xb6, 0x67, 0x38, 0x50, 0x15, 0x9e, 0x29, 0x8c, 0x81, 0xa9, 0xd3, 0x41, + 0xb7, 0x6f, 0x89, 0x56, 0xb4, 0x88, 0x77, 0xb3, 0xba, 0xde, 0xb3, 0xf0, 0xd6, 0x51, 0x2d, 0xf1, + 0x96, 0xd5, 0x34, 0x0e, 0xf4, 0xe1, 0x91, 0xa9, 0x96, 0xc9, 0x6d, 0x58, 0x3f, 0xd4, 0xe9, 0x81, + 0x31, 0x1a, 0x19, 0xc3, 0x81, 0xd5, 0xd3, 0x07, 0x86, 0xde, 0x53, 0x2b, 0x7c, 0x9d, 0x5d, 0x63, + 0xdf, 0xec, 0xee, 0xf6, 0x75, 0xb9, 0x4e, 0x95, 0x6c, 0xc2, 0x5b, 0x7b, 0xc3, 0x83, 0x03, 0xc3, + 0x34, 0xf5, 0x9e, 0xb5, 0x7b, 0x64, 0x5a, 0x23, 0xd3, 0xe8, 0xf7, 0xad, 0xee, 0xe1, 0x61, 0xff, + 0x29, 0x4f, 0x60, 0x35, 0x72, 0x17, 0x36, 0xf6, 0xba, 0x87, 0xdd, 0x5d, 0xa3, 0x6f, 0x98, 0x4f, + 0xad, 0x9e, 0x31, 0xe2, 0xf3, 0x7b, 0x6a, 0x9d, 0x27, 0x6c, 0x93, 0x3e, 0xb5, 0xba, 0x7d, 0x14, + 0xcd, 0xd4, 0xad, 0xdd, 0xee, 0xde, 0x13, 0x7d, 0xd0, 0x53, 0x81, 0x0b, 0x30, 0xea, 0x3e, 0xd2, + 0x2d, 0x2e, 0x92, 0x65, 0x0e, 0x87, 0xd6, 0xb0, 0xdf, 0x53, 0x1b, 0xda, 0xbf, 0x14, 0xa1, 0xb4, + 0xe7, 0x47, 0x31, 0xf7, 0x46, 0xe1, 0xac, 0x2f, 0x42, 0x37, 0x66, 0xa2, 0x7f, 0x2b, 0x53, 0xd1, + 0x4b, 0x7f, 0x87, 0x24, 0x1e, 0x50, 0x32, 0x10, 0xeb, 0xd9, 0x19, 0xc7, 0x29, 0x88, 0x5b, 0x3b, + 0xc7, 0xed, 0x72, 0xb2, 0x88, 0x68, 0x78, 0x85, 0x23, 0xd7, 0x2b, 0x22, 0x4e, 0x06, 0x61, 0xb9, + 0xe0, 0xc7, 0x40, 0xb2, 0x20, 0xb9, 0x62, 0x09, 0x91, 0x6a, 0x06, 0x29, 0x96, 0xdc, 0x01, 0x18, + 0xfb, 0xb3, 0x99, 0x1b, 0x8f, 0xfd, 0x28, 0x96, 0x5f, 0xc8, 0xda, 0x39, 0x63, 0x8f, 0x62, 0x6e, + 0xf1, 0x33, 0x37, 0xe6, 0x8f, 0x34, 0x83, 0x26, 0x3b, 0x70, 0xcf, 0x0e, 0x82, 0xd0, 0x7f, 0xe9, + 0xce, 0xec, 0x98, 0x59, 0xdc, 0x73, 0xed, 0x63, 0x66, 0x39, 0x6c, 0x1a, 0xdb, 0xd8, 0x13, 0x95, + 0xe9, 0xdd, 0x0c, 0x60, 0x24, 0xf8, 0x3d, 0xce, 0xe6, 0x71, 0xd7, 0x75, 0xac, 0x88, 0xfd, 0x30, + 0xe7, 0x1e, 0x60, 0xcd, 0x03, 0xc7, 0xe6, 0x62, 0xd6, 0x45, 0x96, 0x72, 0x9d, 0x91, 0xe4, 0x1c, + 0x09, 0x46, 0xfb, 0x15, 0xc0, 0xb9, 0x14, 0x64, 0x1b, 0x6e, 0xf3, 0x3a, 0x9e, 0x45, 0x31, 0x73, + 0x2c, 0xb9, 0xdb, 0x60, 0x1e, 0x47, 0x18, 0xe2, 0xcb, 0x74, 0x23, 0x65, 0xca, 0x9b, 0xc2, 0x79, + 0x1c, 0x91, 0x9f, 0x40, 0xeb, 0xc2, 0x1c, 0x87, 0x4d, 0x19, 0x7f, 0x6d, 0x15, 0xa7, 0xdd, 0x59, + 0x98, 0xd6, 0x13, 0x5c, 0xed, 0x4f, 0x14, 0x80, 0x7d, 0x16, 0x53, 0xc1, 0xcd, 0x34, 0xb6, 0x95, + 0xeb, 0x36, 0xb6, 0xef, 0x27, 0x17, 0x08, 0xc5, 0xab, 0x63, 0xc0, 0x42, 0x97, 0xa1, 0xdc, 0xa4, + 0xcb, 0xc8, 0x35, 0x11, 0xc5, 0x2b, 0x9a, 0x88, 0x52, 0xae, 0x89, 0xf8, 0x18, 0x9a, 0xf6, 0x74, + 0xea, 0xbf, 0xe0, 0x05, 0x0d, 0x0b, 0x43, 0xe6, 0xa0, 0x11, 0x9c, 0xd7, 0xdb, 0xc8, 0xec, 0x49, + 0x9e, 0xf6, 0xe7, 0x0a, 0x34, 0x50, 0x15, 0x51, 0xe0, 0x7b, 0x11, 0x23, 0x5f, 0x42, 0x45, 0x5e, + 0x44, 0x8b, 0x8b, 0xfc, 0xb7, 0x33, 0xb2, 0x66, 0x70, 0xb2, 0x68, 0xa0, 0x12, 0xcc, 0x33, 0x42, + 0xe6, 0x75, 0x97, 0x2b, 0x25, 0x45, 0x91, 0xfb, 0x50, 0x73, 0x3d, 0x4b, 0xb4, 0xd4, 0x95, 0x4c, + 0x58, 0xac, 0xba, 0x1e, 0xd6, 0xb2, 0xed, 0x57, 0x50, 0x11, 0x2f, 0x21, 0x9d, 0x54, 0xa6, 0x8b, + 0xfa, 0xcb, 0xdc, 0x1c, 0xa7, 0xc2, 0xc8, 0xc3, 0x29, 0xbd, 0x2e, 0x40, 0xb7, 0xa0, 0x7a, 0xca, + 0x9b, 0x0f, 0xbc, 0xf4, 0xe3, 0xea, 0x4d, 0x86, 0xda, 0x1f, 0x97, 0x00, 0x0e, 0xe7, 0x4b, 0x0c, + 0xa4, 0x71, 0x5d, 0x03, 0xe9, 0xe4, 0xf4, 0xf8, 0x7a, 0x99, 0x7f, 0x75, 0x43, 0x59, 0xd2, 0x69, + 0x17, 0x6f, 0xda, 0x69, 0xdf, 0x87, 0x6a, 0x1c, 0xce, 0xb9, 0xa3, 0x08, 0x63, 0x4a, 0x5b, 0x5a, + 0x49, 0x25, 0x6f, 0x42, 0x79, 0xe2, 0x87, 0x63, 0x86, 0x8e, 0x95, 0xb2, 0x05, 0xed, 0xc2, 0x65, + 0x52, 0xed, 0xb2, 0xcb, 0x24, 0xde, 0xa0, 0x45, 0xf2, 0x1e, 0x0d, 0x0b, 0x99, 0x7c, 0x83, 0x96, + 0x5c, 0xb1, 0xd1, 0x14, 0x44, 0xbe, 0x81, 0xa6, 0x3d, 0x8f, 0x7d, 0xcb, 0xe5, 0x15, 0xda, 0xd4, + 0x1d, 0x9f, 0x61, 0xd9, 0xdd, 0xcc, 0x7f, 0xaf, 0x4f, 0x0f, 0xaa, 0xd3, 0x9d, 0xc7, 0xbe, 0xe1, + 0x1c, 0x22, 0x72, 0xa7, 0x2a, 0x93, 0x12, 0x5d, 0xb1, 0x33, 0x64, 0xed, 0xc7, 0xb0, 0x92, 0x85, + 0xf1, 0x04, 0x24, 0x81, 0xea, 0x1b, 0x3c, 0x3b, 0x8d, 0x78, 0x6a, 0x1b, 0x98, 0x46, 0xb7, 0xaf, + 0x16, 0xb4, 0x18, 0x1a, 0xb8, 0xbc, 0xf4, 0x8e, 0xeb, 0xba, 0xfd, 0x03, 0x28, 0x61, 0xf8, 0x55, + 0x2e, 0x7c, 0x0f, 0xc1, 0x98, 0x8b, 0xcc, 0xbc, 0xf9, 0x15, 0xb3, 0xe6, 0xf7, 0xdf, 0x05, 0x58, + 0x31, 0xfd, 0xf9, 0xf8, 0xe4, 0xa2, 0x01, 0xc2, 0xaf, 0x3b, 0x42, 0x2d, 0x31, 0x1f, 0xe5, 0xa6, + 0xe6, 0x93, 0x5a, 0x47, 0x71, 0x89, 0x75, 0xdc, 0xf4, 0xcc, 0xb5, 0x2f, 0x60, 0x55, 0x6e, 0x5e, + 0x6a, 0x3d, 0xd1, 0x66, 0xe1, 0x0a, 0x6d, 0x6a, 0xbf, 0x50, 0x60, 0x55, 0xc4, 0xf7, 0xff, 0xbb, + 0xd2, 0x2a, 0x37, 0x0c, 0xeb, 0xe5, 0x1b, 0x5d, 0x1e, 0xfd, 0xbf, 0xf4, 0x34, 0x6d, 0x08, 0xcd, + 0x44, 0x7d, 0x37, 0x50, 0xfb, 0x15, 0x46, 0xfc, 0x8b, 0x02, 0x34, 0x06, 0xec, 0xe5, 0x92, 0x20, + 0x5a, 0xbe, 0xee, 0x71, 0x7c, 0x98, 0x2b, 0x57, 0x1b, 0xdb, 0xeb, 0x59, 0x19, 0xc4, 0xd5, 0x63, + 0x52, 0xc1, 0xa6, 0xb7, 0xa8, 0xca, 0xf2, 0x5b, 0xd4, 0xd2, 0x62, 0xb7, 0x9e, 0xb9, 0xc5, 0x2b, + 0x2e, 0xbb, 0xc5, 0xd3, 0xfe, 0xad, 0x08, 0x0d, 0x6c, 0x90, 0x29, 0x8b, 0xe6, 0xd3, 0x38, 0x27, + 0x4c, 0xe1, 0x6a, 0x61, 0x3a, 0x50, 0x09, 0x71, 0x92, 0x74, 0xa5, 0x4b, 0x83, 0xbf, 0x40, 0x61, + 0x6b, 0xfc, 0xdc, 0x0d, 0x02, 0xe6, 0x58, 0x82, 0x92, 0x14, 0x30, 0x4d, 0x49, 0x16, 0x22, 0x44, + 0xbc, 0xfc, 0x9c, 0xf9, 0x21, 0x4b, 0x51, 0x45, 0xbc, 0x4f, 0x68, 0x70, 0x5a, 0x02, 0xc9, 0xdd, + 0x37, 0x88, 0xca, 0xe0, 0xfc, 0xbe, 0x21, 0xed, 0x35, 0x91, 0x5b, 0x47, 0xae, 0xe8, 0x35, 0x91, + 0xcd, 0xbb, 0xa8, 0x99, 0x3d, 0x9d, 0x5a, 0x7e, 0x10, 0xa1, 0xd3, 0xd4, 0x68, 0x0d, 0x09, 0xc3, + 0x20, 0x22, 0x5f, 0x43, 0x7a, 0x5d, 0x2c, 0x6f, 0xc9, 0xc5, 0x39, 0xb6, 0x2e, 0xbb, 0x58, 0xa0, + 0xab, 0xe3, 0xdc, 0xfd, 0xcf, 0x92, 0x1b, 0xea, 0xca, 0x4d, 0x6f, 0xa8, 0x1f, 0x42, 0x59, 0xc4, + 0xa8, 0xda, 0xeb, 0x62, 0x94, 0xc0, 0x65, 0xed, 0xb3, 0x91, 0xb7, 0xcf, 0x5f, 0x16, 0x80, 0x74, + 0xa7, 0x53, 0x7f, 0x6c, 0xc7, 0xcc, 0x70, 0xa2, 0x8b, 0x66, 0x7a, 0xed, 0xcf, 0x2e, 0x9f, 0x41, + 0x7d, 0xe6, 0x3b, 0x6c, 0x6a, 0x25, 0xdf, 0x94, 0x2e, 0xad, 0x7e, 0x10, 0xc6, 0x5b, 0x52, 0x02, + 0x25, 0xbc, 0xc4, 0x51, 0xb0, 0xee, 0xc0, 0x67, 0xde, 0x84, 0xcd, 0xec, 0x97, 0xb2, 0x14, 0xe1, + 0x8f, 0xa4, 0x03, 0xd5, 0x90, 0x45, 0x2c, 0x3c, 0x65, 0x57, 0x16, 0x55, 0x09, 0x48, 0x7b, 0x06, + 0x1b, 0xb9, 0x1d, 0x49, 0x47, 0xbe, 0x85, 0x5f, 0x2b, 0xc3, 0x58, 0x7e, 0xb4, 0x12, 0x03, 0xfe, + 0x3a, 0xe6, 0x25, 0x9f, 0x41, 0xf9, 0x63, 0xea, 0xf0, 0xc5, 0xab, 0xe2, 0xec, 0x1e, 0xa8, 0x59, + 0x4d, 0xbb, 0x63, 0x0c, 0x36, 0xf2, 0x54, 0x0a, 0xd7, 0x3b, 0x15, 0xed, 0xef, 0x0a, 0xb0, 0xde, + 0x75, 0x1c, 0xf1, 0x77, 0xc3, 0x25, 0xaa, 0x2f, 0x5e, 0x57, 0xf5, 0x0b, 0x81, 0x58, 0x84, 0x89, + 0x6b, 0x05, 0xe2, 0x0f, 0xa1, 0x92, 0xd6, 0x5a, 0xc5, 0x05, 0x77, 0x16, 0x72, 0x51, 0x09, 0xd0, + 0x6e, 0x01, 0xc9, 0x0a, 0x2b, 0xb4, 0xaa, 0xfd, 0x69, 0x11, 0xee, 0xee, 0xb2, 0x63, 0xd7, 0xcb, + 0xbe, 0xe2, 0x57, 0xdf, 0xc9, 0xc5, 0x4f, 0x65, 0x9f, 0xc1, 0xba, 0x28, 0xe4, 0x93, 0x7f, 0x62, + 0x59, 0xec, 0x58, 0x7e, 0x9d, 0x94, 0xb1, 0x6a, 0x0d, 0xf9, 0x07, 0x92, 0xad, 0xe3, 0x7f, 0xc5, + 0x1c, 0x3b, 0xb6, 0x9f, 0xd9, 0x11, 0xb3, 0x5c, 0x47, 0xfe, 0x59, 0x06, 0x12, 0x92, 0xe1, 0x90, + 0x21, 0x94, 0xb8, 0x0d, 0xa2, 0xeb, 0x36, 0xb7, 0xb7, 0x33, 0x62, 0x5d, 0xb2, 0x95, 0xac, 0x02, + 0x0f, 0x7c, 0x87, 0xed, 0x54, 0x8f, 0x06, 0x4f, 0x06, 0xc3, 0xef, 0x06, 0x14, 0x17, 0x22, 0x06, + 0xdc, 0x0a, 0x42, 0x76, 0xea, 0xfa, 0xf3, 0xc8, 0xca, 0x9e, 0x44, 0xf5, 0xca, 0x94, 0xb8, 0x91, + 0xcc, 0xc9, 0x10, 0xb5, 0x9f, 0xc2, 0xda, 0xc2, 0xcb, 0x78, 0x6d, 0x26, 0x5f, 0xa7, 0xbe, 0x41, + 0x56, 0xa1, 0x8e, 0x1f, 0xbb, 0x97, 0x7f, 0xfb, 0xd6, 0xfe, 0xb5, 0x80, 0x57, 0x4c, 0x33, 0x37, + 0xbe, 0x59, 0x06, 0xfb, 0xcd, 0x7c, 0x06, 0x83, 0xed, 0x77, 0xf3, 0xe6, 0x9b, 0x59, 0xb0, 0xf3, + 0xad, 0x00, 0xa6, 0x41, 0xa4, 0x6d, 0x43, 0x55, 0xd2, 0xc8, 0x6f, 0xc1, 0x5a, 0xe8, 0xfb, 0x71, + 0xd2, 0x89, 0x8a, 0x0e, 0xe4, 0xf2, 0x3f, 0xdb, 0xac, 0x72, 0xb0, 0x48, 0x06, 0x4f, 0xf2, 0xbd, + 0x48, 0x59, 0xfc, 0x0d, 0x44, 0x0e, 0x77, 0x1b, 0xbf, 0x5b, 0x4f, 0xff, 0xb7, 0xfb, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x35, 0x9f, 0x30, 0x98, 0xf2, 0x2b, 0x00, 0x00, +} diff --git a/vendor/cloud.google.com/go/datastore/key.go b/vendor/cloud.google.com/go/datastore/key.go new file mode 100644 index 000000000000..a25edc88fd94 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/key.go @@ -0,0 +1,293 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "bytes" + "context" + "encoding/base64" + "encoding/gob" + "errors" + "strconv" + "strings" + + "github.com/golang/protobuf/proto" + pb "google.golang.org/genproto/googleapis/datastore/v1" +) + +// Key represents the datastore key for a stored entity. +type Key struct { + // Kind cannot be empty. + Kind string + // Either ID or Name must be zero for the Key to be valid. + // If both are zero, the Key is incomplete. + ID int64 + Name string + // Parent must either be a complete Key or nil. + Parent *Key + + // Namespace provides the ability to partition your data for multiple + // tenants. In most cases, it is not necessary to specify a namespace. + // See docs on datastore multitenancy for details: + // https://cloud.google.com/datastore/docs/concepts/multitenancy + Namespace string +} + +// Incomplete reports whether the key does not refer to a stored entity. +func (k *Key) Incomplete() bool { + return k.Name == "" && k.ID == 0 +} + +// valid returns whether the key is valid. +func (k *Key) valid() bool { + if k == nil { + return false + } + for ; k != nil; k = k.Parent { + if k.Kind == "" { + return false + } + if k.Name != "" && k.ID != 0 { + return false + } + if k.Parent != nil { + if k.Parent.Incomplete() { + return false + } + if k.Parent.Namespace != k.Namespace { + return false + } + } + } + return true +} + +// Equal reports whether two keys are equal. Two keys are equal if they are +// both nil, or if their kinds, IDs, names, namespaces and parents are equal. +func (k *Key) Equal(o *Key) bool { + for { + if k == nil || o == nil { + return k == o // if either is nil, both must be nil + } + if k.Namespace != o.Namespace || k.Name != o.Name || k.ID != o.ID || k.Kind != o.Kind { + return false + } + if k.Parent == nil && o.Parent == nil { + return true + } + k = k.Parent + o = o.Parent + } +} + +// marshal marshals the key's string representation to the buffer. +func (k *Key) marshal(b *bytes.Buffer) { + if k.Parent != nil { + k.Parent.marshal(b) + } + b.WriteByte('/') + b.WriteString(k.Kind) + b.WriteByte(',') + if k.Name != "" { + b.WriteString(k.Name) + } else { + b.WriteString(strconv.FormatInt(k.ID, 10)) + } +} + +// String returns a string representation of the key. +func (k *Key) String() string { + if k == nil { + return "" + } + b := bytes.NewBuffer(make([]byte, 0, 512)) + k.marshal(b) + return b.String() +} + +// Note: Fields not renamed compared to appengine gobKey struct +// This ensures gobs created by appengine can be read here, and vice/versa +type gobKey struct { + Kind string + StringID string + IntID int64 + Parent *gobKey + AppID string + Namespace string +} + +func keyToGobKey(k *Key) *gobKey { + if k == nil { + return nil + } + return &gobKey{ + Kind: k.Kind, + StringID: k.Name, + IntID: k.ID, + Parent: keyToGobKey(k.Parent), + Namespace: k.Namespace, + } +} + +func gobKeyToKey(gk *gobKey) *Key { + if gk == nil { + return nil + } + return &Key{ + Kind: gk.Kind, + Name: gk.StringID, + ID: gk.IntID, + Parent: gobKeyToKey(gk.Parent), + Namespace: gk.Namespace, + } +} + +// GobEncode marshals the key into a sequence of bytes +// using an encoding/gob.Encoder. +func (k *Key) GobEncode() ([]byte, error) { + buf := new(bytes.Buffer) + if err := gob.NewEncoder(buf).Encode(keyToGobKey(k)); err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +// GobDecode unmarshals a sequence of bytes using an encoding/gob.Decoder. +func (k *Key) GobDecode(buf []byte) error { + gk := new(gobKey) + if err := gob.NewDecoder(bytes.NewBuffer(buf)).Decode(gk); err != nil { + return err + } + *k = *gobKeyToKey(gk) + return nil +} + +// MarshalJSON marshals the key into JSON. +func (k *Key) MarshalJSON() ([]byte, error) { + return []byte(`"` + k.Encode() + `"`), nil +} + +// UnmarshalJSON unmarshals a key JSON object into a Key. +func (k *Key) UnmarshalJSON(buf []byte) error { + if len(buf) < 2 || buf[0] != '"' || buf[len(buf)-1] != '"' { + return errors.New("datastore: bad JSON key") + } + k2, err := DecodeKey(string(buf[1 : len(buf)-1])) + if err != nil { + return err + } + *k = *k2 + return nil +} + +// Encode returns an opaque representation of the key +// suitable for use in HTML and URLs. +// This is compatible with the Python and Java runtimes. +func (k *Key) Encode() string { + pKey := keyToProto(k) + + b, err := proto.Marshal(pKey) + if err != nil { + panic(err) + } + + // Trailing padding is stripped. + return strings.TrimRight(base64.URLEncoding.EncodeToString(b), "=") +} + +// DecodeKey decodes a key from the opaque representation returned by Encode. +func DecodeKey(encoded string) (*Key, error) { + k, err := decodeCloudKey(encoded) + if err != nil { + // Couldn't decode it as a Cloud Datastore key, try decoding it as a key encoded by google.golang.org/appengine/datastore. + if k := decodeGAEKey(encoded); k != nil { + return k, nil + } + // Return original error. + return nil, err + } + return k, nil +} + +func decodeCloudKey(encoded string) (*Key, error) { + // Re-add padding. + if m := len(encoded) % 4; m != 0 { + encoded += strings.Repeat("=", 4-m) + } + + b, err := base64.URLEncoding.DecodeString(encoded) + if err != nil { + return nil, err + } + + pKey := new(pb.Key) + if err := proto.Unmarshal(b, pKey); err != nil { + return nil, err + } + return protoToKey(pKey) +} + +// AllocateIDs accepts a slice of incomplete keys and returns a +// slice of complete keys that are guaranteed to be valid in the datastore. +func (c *Client) AllocateIDs(ctx context.Context, keys []*Key) ([]*Key, error) { + if keys == nil { + return nil, nil + } + + req := &pb.AllocateIdsRequest{ + ProjectId: c.dataset, + Keys: multiKeyToProto(keys), + } + resp, err := c.client.AllocateIds(ctx, req) + if err != nil { + return nil, err + } + + return multiProtoToKey(resp.Keys) +} + +// IncompleteKey creates a new incomplete key. +// The supplied kind cannot be empty. +// The namespace of the new key is empty. +func IncompleteKey(kind string, parent *Key) *Key { + return &Key{ + Kind: kind, + Parent: parent, + } +} + +// NameKey creates a new key with a name. +// The supplied kind cannot be empty. +// The supplied parent must either be a complete key or nil. +// The namespace of the new key is empty. +func NameKey(kind, name string, parent *Key) *Key { + return &Key{ + Kind: kind, + Name: name, + Parent: parent, + } +} + +// IDKey creates a new key with an ID. +// The supplied kind cannot be empty. +// The supplied parent must either be a complete key or nil. +// The namespace of the new key is empty. +func IDKey(kind string, id int64, parent *Key) *Key { + return &Key{ + Kind: kind, + ID: id, + Parent: parent, + } +} diff --git a/vendor/cloud.google.com/go/datastore/keycompat.go b/vendor/cloud.google.com/go/datastore/keycompat.go new file mode 100644 index 000000000000..0464fe7e6815 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/keycompat.go @@ -0,0 +1,66 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "encoding/base64" + "strings" + + "cloud.google.com/go/datastore/internal/gaepb" + "github.com/golang/protobuf/proto" +) + +// decodeGAEKey attempts to decode the given encoded key generated by the +// GAE Datastore package (google.golang.org/appengine/datastore), returning nil +// if the key couldn't be decoded. +func decodeGAEKey(encoded string) *Key { + // Re-add padding. + if m := len(encoded) % 4; m != 0 { + encoded += strings.Repeat("=", 4-m) + } + + b, err := base64.URLEncoding.DecodeString(encoded) + if err != nil { + return nil + } + ref := new(gaepb.Reference) + if err := proto.Unmarshal(b, ref); err != nil { + return nil + } + return gaeProtoToKey(ref) +} + +// gaeProtoToKey accepts a GAE Datastore key and converts it to a Cloud Datastore key. +// This is adapted from the "protoToKey" function in the appengine/datastore package. +// +// NOTE(cbro): this is a lossy operation, as GAE Datastore keys include the project/app ID, +// but Cloud Datastore keys do not. +func gaeProtoToKey(r *gaepb.Reference) *Key { + namespace := r.GetNameSpace() + var k *Key + for _, e := range r.Path.Element { + k = &Key{ + Kind: e.GetType(), + Name: e.GetName(), + ID: e.GetId(), + Parent: k, + Namespace: namespace, + } + } + if !k.valid() { + return nil + } + return k +} diff --git a/vendor/cloud.google.com/go/datastore/load.go b/vendor/cloud.google.com/go/datastore/load.go new file mode 100644 index 000000000000..ffed38bb443a --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/load.go @@ -0,0 +1,545 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "fmt" + "reflect" + "strings" + "time" + + "cloud.google.com/go/internal/fields" + pb "google.golang.org/genproto/googleapis/datastore/v1" +) + +var ( + typeOfByteSlice = reflect.TypeOf([]byte(nil)) + typeOfTime = reflect.TypeOf(time.Time{}) + typeOfGeoPoint = reflect.TypeOf(GeoPoint{}) + typeOfKeyPtr = reflect.TypeOf(&Key{}) +) + +// typeMismatchReason returns a string explaining why the property p could not +// be stored in an entity field of type v.Type(). +func typeMismatchReason(p Property, v reflect.Value) string { + entityType := "empty" + switch p.Value.(type) { + case int64: + entityType = "int" + case bool: + entityType = "bool" + case string: + entityType = "string" + case float64: + entityType = "float" + case *Key: + entityType = "*datastore.Key" + case *Entity: + entityType = "*datastore.Entity" + case GeoPoint: + entityType = "GeoPoint" + case time.Time: + entityType = "time.Time" + case []byte: + entityType = "[]byte" + } + + return fmt.Sprintf("type mismatch: %s versus %v", entityType, v.Type()) +} + +func overflowReason(x interface{}, v reflect.Value) string { + return fmt.Sprintf("value %v overflows struct field of type %v", x, v.Type()) +} + +type propertyLoader struct { + // m holds the number of times a substruct field like "Foo.Bar.Baz" has + // been seen so far. The map is constructed lazily. + m map[string]int +} + +func (l *propertyLoader) load(codec fields.List, structValue reflect.Value, p Property, prev map[string]struct{}) string { + sl, ok := p.Value.([]interface{}) + if !ok { + return l.loadOneElement(codec, structValue, p, prev) + } + for _, val := range sl { + p.Value = val + if errStr := l.loadOneElement(codec, structValue, p, prev); errStr != "" { + return errStr + } + } + return "" +} + +// loadOneElement loads the value of Property p into structValue based on the provided +// codec. codec is used to find the field in structValue into which p should be loaded. +// prev is the set of property names already seen for structValue. +func (l *propertyLoader) loadOneElement(codec fields.List, structValue reflect.Value, p Property, prev map[string]struct{}) string { + var sliceOk bool + var sliceIndex int + var v reflect.Value + + name := p.Name + fieldNames := strings.Split(name, ".") + + for len(fieldNames) > 0 { + var field *fields.Field + + // Start by trying to find a field with name. If none found, + // cut off the last field (delimited by ".") and find its parent + // in the codec. + // eg. for name "A.B.C.D", split off "A.B.C" and try to + // find a field in the codec with this name. + // Loop again with "A.B", etc. + for i := len(fieldNames); i > 0; i-- { + parent := strings.Join(fieldNames[:i], ".") + field = codec.Match(parent) + if field != nil { + fieldNames = fieldNames[i:] + break + } + } + + // If we never found a matching field in the codec, return + // error message. + if field == nil { + return "no such struct field" + } + + v = initField(structValue, field.Index) + if !v.IsValid() { + return "no such struct field" + } + if !v.CanSet() { + return "cannot set struct field" + } + + // If field implements PLS, we delegate loading to the PLS's Load early, + // and stop iterating through fields. + ok, err := plsFieldLoad(v, p, fieldNames) + if err != nil { + return err.Error() + } + if ok { + return "" + } + + if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct { + codec, err = structCache.Fields(field.Type.Elem()) + if err != nil { + return err.Error() + } + + // Init value if its nil + if v.IsNil() { + v.Set(reflect.New(field.Type.Elem())) + } + structValue = v.Elem() + } + + if field.Type.Kind() == reflect.Struct { + codec, err = structCache.Fields(field.Type) + if err != nil { + return err.Error() + } + structValue = v + } + + // If the element is a slice, we need to accommodate it. + if v.Kind() == reflect.Slice && v.Type() != typeOfByteSlice { + if l.m == nil { + l.m = make(map[string]int) + } + sliceIndex = l.m[p.Name] + l.m[p.Name] = sliceIndex + 1 + for v.Len() <= sliceIndex { + v.Set(reflect.Append(v, reflect.New(v.Type().Elem()).Elem())) + } + structValue = v.Index(sliceIndex) + + // If structValue implements PLS, we delegate loading to the PLS's + // Load early, and stop iterating through fields. + ok, err := plsFieldLoad(structValue, p, fieldNames) + if err != nil { + return err.Error() + } + if ok { + return "" + } + + if structValue.Type().Kind() == reflect.Struct { + codec, err = structCache.Fields(structValue.Type()) + if err != nil { + return err.Error() + } + } + sliceOk = true + } + } + + var slice reflect.Value + if v.Kind() == reflect.Slice && v.Type().Elem().Kind() != reflect.Uint8 { + slice = v + v = reflect.New(v.Type().Elem()).Elem() + } else if _, ok := prev[p.Name]; ok && !sliceOk { + // Zero the field back out that was set previously, turns out + // it's a slice and we don't know what to do with it + v.Set(reflect.Zero(v.Type())) + return "multiple-valued property requires a slice field type" + } + + prev[p.Name] = struct{}{} + + if errReason := setVal(v, p); errReason != "" { + // Set the slice back to its zero value. + if slice.IsValid() { + slice.Set(reflect.Zero(slice.Type())) + } + return errReason + } + + if slice.IsValid() { + slice.Index(sliceIndex).Set(v) + } + + return "" +} + +// plsFieldLoad first tries to converts v's value to a PLS, then v's addressed +// value to a PLS. If neither succeeds, plsFieldLoad returns false for first return +// value. Otherwise, the first return value will be true. +// If v is successfully converted to a PLS, plsFieldLoad will then try to Load +// the property p into v (by way of the PLS's Load method). +// +// If the field v has been flattened, the Property's name must be altered +// before calling Load to reflect the field v. +// For example, if our original field name was "A.B.C.D", +// and at this point in iteration we had initialized the field +// corresponding to "A" and have moved into the struct, so that now +// v corresponds to the field named "B", then we want to let the +// PLS handle this field (B)'s subfields ("C", "D"), +// so we send the property to the PLS's Load, renamed to "C.D". +// +// If subfields are present, the field v has been flattened. +func plsFieldLoad(v reflect.Value, p Property, subfields []string) (ok bool, err error) { + vpls, err := plsForLoad(v) + if err != nil { + return false, err + } + + if vpls == nil { + return false, nil + } + + // If Entity, load properties as well as key. + if e, ok := p.Value.(*Entity); ok { + err = loadEntity(vpls, e) + return true, err + } + + // If flattened, we must alter the property's name to reflect + // the field v. + if len(subfields) > 0 { + p.Name = strings.Join(subfields, ".") + } + + return true, vpls.Load([]Property{p}) +} + +// setVal sets 'v' to the value of the Property 'p'. +func setVal(v reflect.Value, p Property) (s string) { + pValue := p.Value + switch v.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + x, ok := pValue.(int64) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + if v.OverflowInt(x) { + return overflowReason(x, v) + } + v.SetInt(x) + case reflect.Bool: + x, ok := pValue.(bool) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + v.SetBool(x) + case reflect.String: + x, ok := pValue.(string) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + v.SetString(x) + case reflect.Float32, reflect.Float64: + x, ok := pValue.(float64) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + if v.OverflowFloat(x) { + return overflowReason(x, v) + } + v.SetFloat(x) + + case reflect.Interface: + if !v.CanSet() { + return fmt.Sprintf("%v is unsettable", v.Type()) + } + + rpValue := reflect.ValueOf(pValue) + if !rpValue.Type().AssignableTo(v.Type()) { + return fmt.Sprintf("%q is not assignable to %q", rpValue.Type(), v.Type()) + } + v.Set(rpValue) + + case reflect.Ptr: + // v must be a pointer to either a Key, an Entity, or one of the supported basic types. + if v.Type() != typeOfKeyPtr && v.Type().Elem().Kind() != reflect.Struct && !isValidPointerType(v.Type().Elem()) { + return typeMismatchReason(p, v) + } + + if pValue == nil { + // If v is populated already, set it to nil. + if !v.IsNil() { + v.Set(reflect.New(v.Type()).Elem()) + } + return "" + } + + if x, ok := p.Value.(*Key); ok { + if _, ok := v.Interface().(*Key); !ok { + return typeMismatchReason(p, v) + } + v.Set(reflect.ValueOf(x)) + return "" + } + if v.IsNil() { + v.Set(reflect.New(v.Type().Elem())) + } + switch x := pValue.(type) { + case *Entity: + err := loadEntity(v.Interface(), x) + if err != nil { + return err.Error() + } + case int64: + if v.Elem().OverflowInt(x) { + return overflowReason(x, v.Elem()) + } + v.Elem().SetInt(x) + case float64: + if v.Elem().OverflowFloat(x) { + return overflowReason(x, v.Elem()) + } + v.Elem().SetFloat(x) + case bool: + v.Elem().SetBool(x) + case string: + v.Elem().SetString(x) + case GeoPoint, time.Time: + v.Elem().Set(reflect.ValueOf(x)) + default: + return typeMismatchReason(p, v) + } + case reflect.Struct: + switch v.Type() { + case typeOfTime: + // Some time values are converted into microsecond integer values + // (for example when used with projects). So, here we check first + // whether this value is an int64, and next whether it's time. + // + // See more at https://cloud.google.com/datastore/docs/concepts/queries#limitations_on_projections + micros, ok := pValue.(int64) + if ok { + s := micros / 1e6 + ns := micros % 1e6 + v.Set(reflect.ValueOf(time.Unix(s, ns))) + break + } + x, ok := pValue.(time.Time) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + v.Set(reflect.ValueOf(x)) + case typeOfGeoPoint: + x, ok := pValue.(GeoPoint) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + v.Set(reflect.ValueOf(x)) + default: + ent, ok := pValue.(*Entity) + if !ok { + return typeMismatchReason(p, v) + } + err := loadEntity(v.Addr().Interface(), ent) + if err != nil { + return err.Error() + } + } + case reflect.Slice: + x, ok := pValue.([]byte) + if !ok && pValue != nil { + return typeMismatchReason(p, v) + } + if v.Type().Elem().Kind() != reflect.Uint8 { + return typeMismatchReason(p, v) + } + v.SetBytes(x) + default: + return typeMismatchReason(p, v) + } + return "" +} + +// initField is similar to reflect's Value.FieldByIndex, in that it +// returns the nested struct field corresponding to index, but it +// initialises any nil pointers encountered when traversing the structure. +func initField(val reflect.Value, index []int) reflect.Value { + for _, i := range index[:len(index)-1] { + val = val.Field(i) + if val.Kind() == reflect.Ptr { + if val.IsNil() { + val.Set(reflect.New(val.Type().Elem())) + } + val = val.Elem() + } + } + return val.Field(index[len(index)-1]) +} + +// loadEntityProto loads an EntityProto into PropertyLoadSaver or struct pointer. +func loadEntityProto(dst interface{}, src *pb.Entity) error { + ent, err := protoToEntity(src) + if err != nil { + return err + } + return loadEntity(dst, ent) +} + +func loadEntity(dst interface{}, ent *Entity) error { + if pls, ok := dst.(PropertyLoadSaver); ok { + err := pls.Load(ent.Properties) + if err != nil { + return err + } + if e, ok := dst.(KeyLoader); ok { + err = e.LoadKey(ent.Key) + } + return err + } + return loadEntityToStruct(dst, ent) +} + +func loadEntityToStruct(dst interface{}, ent *Entity) error { + pls, err := newStructPLS(dst) + if err != nil { + return err + } + + // Try and load key. + keyField := pls.codec.Match(keyFieldName) + if keyField != nil && ent.Key != nil { + pls.v.FieldByIndex(keyField.Index).Set(reflect.ValueOf(ent.Key)) + } + + // Load properties. + return pls.Load(ent.Properties) +} + +func (s structPLS) Load(props []Property) error { + var fieldName, errReason string + var l propertyLoader + + prev := make(map[string]struct{}) + for _, p := range props { + if errStr := l.load(s.codec, s.v, p, prev); errStr != "" { + // We don't return early, as we try to load as many properties as possible. + // It is valid to load an entity into a struct that cannot fully represent it. + // That case returns an error, but the caller is free to ignore it. + fieldName, errReason = p.Name, errStr + } + } + if errReason != "" { + return &ErrFieldMismatch{ + StructType: s.v.Type(), + FieldName: fieldName, + Reason: errReason, + } + } + return nil +} + +func protoToEntity(src *pb.Entity) (*Entity, error) { + props := make([]Property, 0, len(src.Properties)) + for name, val := range src.Properties { + v, err := propToValue(val) + if err != nil { + return nil, err + } + props = append(props, Property{ + Name: name, + Value: v, + NoIndex: val.ExcludeFromIndexes, + }) + } + var key *Key + if src.Key != nil { + // Ignore any error, since nested entity values + // are allowed to have an invalid key. + key, _ = protoToKey(src.Key) + } + + return &Entity{key, props}, nil +} + +// propToValue returns a Go value that represents the PropertyValue. For +// example, a TimestampValue becomes a time.Time. +func propToValue(v *pb.Value) (interface{}, error) { + switch v := v.ValueType.(type) { + case *pb.Value_NullValue: + return nil, nil + case *pb.Value_BooleanValue: + return v.BooleanValue, nil + case *pb.Value_IntegerValue: + return v.IntegerValue, nil + case *pb.Value_DoubleValue: + return v.DoubleValue, nil + case *pb.Value_TimestampValue: + return time.Unix(v.TimestampValue.Seconds, int64(v.TimestampValue.Nanos)), nil + case *pb.Value_KeyValue: + return protoToKey(v.KeyValue) + case *pb.Value_StringValue: + return v.StringValue, nil + case *pb.Value_BlobValue: + return []byte(v.BlobValue), nil + case *pb.Value_GeoPointValue: + return GeoPoint{Lat: v.GeoPointValue.Latitude, Lng: v.GeoPointValue.Longitude}, nil + case *pb.Value_EntityValue: + return protoToEntity(v.EntityValue) + case *pb.Value_ArrayValue: + arr := make([]interface{}, 0, len(v.ArrayValue.Values)) + for _, v := range v.ArrayValue.Values { + vv, err := propToValue(v) + if err != nil { + return nil, err + } + arr = append(arr, vv) + } + return arr, nil + default: + return nil, nil + } +} diff --git a/vendor/cloud.google.com/go/datastore/mutation.go b/vendor/cloud.google.com/go/datastore/mutation.go new file mode 100644 index 000000000000..f80f96465395 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/mutation.go @@ -0,0 +1,129 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "fmt" + + pb "google.golang.org/genproto/googleapis/datastore/v1" +) + +// A Mutation represents a change to a Datastore entity. +type Mutation struct { + key *Key // needed for transaction PendingKeys and to dedup deletions + mut *pb.Mutation + err error +} + +func (m *Mutation) isDelete() bool { + _, ok := m.mut.Operation.(*pb.Mutation_Delete) + return ok +} + +// NewInsert creates a mutation that will save the entity src into the datastore with +// key k, returning an error if k already exists. +// See Client.Put for valid values of src. +func NewInsert(k *Key, src interface{}) *Mutation { + if !k.valid() { + return &Mutation{err: ErrInvalidKey} + } + p, err := saveEntity(k, src) + if err != nil { + return &Mutation{err: err} + } + return &Mutation{ + key: k, + mut: &pb.Mutation{Operation: &pb.Mutation_Insert{Insert: p}}, + } +} + +// NewUpsert creates a mutation that saves the entity src into the datastore with key +// k, whether or not k exists. See Client.Put for valid values of src. +func NewUpsert(k *Key, src interface{}) *Mutation { + if !k.valid() { + return &Mutation{err: ErrInvalidKey} + } + p, err := saveEntity(k, src) + if err != nil { + return &Mutation{err: err} + } + return &Mutation{ + key: k, + mut: &pb.Mutation{Operation: &pb.Mutation_Upsert{Upsert: p}}, + } +} + +// NewUpdate creates a mutation that replaces the entity in the datastore with key k, +// returning an error if k does not exist. See Client.Put for valid values of src. +func NewUpdate(k *Key, src interface{}) *Mutation { + if !k.valid() { + return &Mutation{err: ErrInvalidKey} + } + if k.Incomplete() { + return &Mutation{err: fmt.Errorf("datastore: can't update the incomplete key: %v", k)} + } + p, err := saveEntity(k, src) + if err != nil { + return &Mutation{err: err} + } + return &Mutation{ + key: k, + mut: &pb.Mutation{Operation: &pb.Mutation_Update{Update: p}}, + } +} + +// NewDelete creates a mutation that deletes the entity with key k. +func NewDelete(k *Key) *Mutation { + if !k.valid() { + return &Mutation{err: ErrInvalidKey} + } + if k.Incomplete() { + return &Mutation{err: fmt.Errorf("datastore: can't delete the incomplete key: %v", k)} + } + return &Mutation{ + key: k, + mut: &pb.Mutation{Operation: &pb.Mutation_Delete{Delete: keyToProto(k)}}, + } +} + +func mutationProtos(muts []*Mutation) ([]*pb.Mutation, error) { + // If any of the mutations have errors, collect and return them. + var merr MultiError + for i, m := range muts { + if m.err != nil { + if merr == nil { + merr = make(MultiError, len(muts)) + } + merr[i] = m.err + } + } + if merr != nil { + return nil, merr + } + var protos []*pb.Mutation + // Collect protos. Remove duplicate deletions (see deleteMutations). + seen := map[string]bool{} + for _, m := range muts { + if m.isDelete() { + ks := m.key.String() + if seen[ks] { + continue + } + seen[ks] = true + } + protos = append(protos, m.mut) + } + return protos, nil +} diff --git a/vendor/cloud.google.com/go/datastore/prop.go b/vendor/cloud.google.com/go/datastore/prop.go new file mode 100644 index 000000000000..645b99a465bc --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/prop.go @@ -0,0 +1,339 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "fmt" + "reflect" + "strings" + "unicode" + + "cloud.google.com/go/internal/fields" +) + +// Entities with more than this many indexed properties will not be saved. +const maxIndexedProperties = 20000 + +// Property is a name/value pair plus some metadata. A datastore entity's +// contents are loaded and saved as a sequence of Properties. Each property +// name must be unique within an entity. +type Property struct { + // Name is the property name. + Name string + // Value is the property value. The valid types are: + // - int64 + // - bool + // - string + // - float64 + // - *Key + // - time.Time (retrieved as local time) + // - GeoPoint + // - []byte (up to 1 megabyte in length) + // - *Entity (representing a nested struct) + // Value can also be: + // - []interface{} where each element is one of the above types + // This set is smaller than the set of valid struct field types that the + // datastore can load and save. A Value's type must be explicitly on + // the list above; it is not sufficient for the underlying type to be + // on that list. For example, a Value of "type myInt64 int64" is + // invalid. Smaller-width integers and floats are also invalid. Again, + // this is more restrictive than the set of valid struct field types. + // + // A Value will have an opaque type when loading entities from an index, + // such as via a projection query. Load entities into a struct instead + // of a PropertyLoadSaver when using a projection query. + // + // A Value may also be the nil interface value; this is equivalent to + // Python's None but not directly representable by a Go struct. Loading + // a nil-valued property into a struct will set that field to the zero + // value. + Value interface{} + // NoIndex is whether the datastore cannot index this property. + // If NoIndex is set to false, []byte and string values are limited to + // 1500 bytes. + NoIndex bool +} + +// An Entity is the value type for a nested struct. +// This type is only used for a Property's Value. +type Entity struct { + Key *Key + Properties []Property +} + +// PropertyLoadSaver can be converted from and to a slice of Properties. +type PropertyLoadSaver interface { + Load([]Property) error + Save() ([]Property, error) +} + +// KeyLoader can store a Key. +type KeyLoader interface { + // PropertyLoadSaver is embedded because a KeyLoader + // must also always implement PropertyLoadSaver. + PropertyLoadSaver + LoadKey(k *Key) error +} + +// PropertyList converts a []Property to implement PropertyLoadSaver. +type PropertyList []Property + +var ( + typeOfPropertyLoadSaver = reflect.TypeOf((*PropertyLoadSaver)(nil)).Elem() + typeOfPropertyList = reflect.TypeOf(PropertyList(nil)) +) + +// Load loads all of the provided properties into l. +// It does not first reset *l to an empty slice. +func (l *PropertyList) Load(p []Property) error { + *l = append(*l, p...) + return nil +} + +// Save saves all of l's properties as a slice of Properties. +func (l *PropertyList) Save() ([]Property, error) { + return *l, nil +} + +// validPropertyName returns whether name consists of one or more valid Go +// identifiers joined by ".". +func validPropertyName(name string) bool { + if name == "" { + return false + } + for _, s := range strings.Split(name, ".") { + if s == "" { + return false + } + first := true + for _, c := range s { + if first { + first = false + if c != '_' && !unicode.IsLetter(c) { + return false + } + } else { + if c != '_' && !unicode.IsLetter(c) && !unicode.IsDigit(c) { + return false + } + } + } + } + return true +} + +// parseTag interprets datastore struct field tags +func parseTag(t reflect.StructTag) (name string, keep bool, other interface{}, err error) { + s := t.Get("datastore") + parts := strings.Split(s, ",") + if parts[0] == "-" && len(parts) == 1 { + return "", false, nil, nil + } + if parts[0] != "" && !validPropertyName(parts[0]) { + err = fmt.Errorf("datastore: struct tag has invalid property name: %q", parts[0]) + return "", false, nil, err + } + + var opts saveOpts + if len(parts) > 1 { + for _, p := range parts[1:] { + switch p { + case "flatten": + opts.flatten = true + case "omitempty": + opts.omitEmpty = true + case "noindex": + opts.noIndex = true + default: + err = fmt.Errorf("datastore: struct tag has invalid option: %q", p) + return "", false, nil, err + } + } + other = opts + } + return parts[0], true, other, nil +} + +func validateType(t reflect.Type) error { + if t.Kind() != reflect.Struct { + return fmt.Errorf("datastore: validate called with non-struct type %s", t) + } + + return validateChildType(t, "", false, false, map[reflect.Type]bool{}) +} + +// validateChildType is a recursion helper func for validateType +func validateChildType(t reflect.Type, fieldName string, flatten, prevSlice bool, prevTypes map[reflect.Type]bool) error { + if prevTypes[t] { + return nil + } + prevTypes[t] = true + + switch t.Kind() { + case reflect.Slice: + if flatten && prevSlice { + return fmt.Errorf("datastore: flattening nested structs leads to a slice of slices: field %q", fieldName) + } + return validateChildType(t.Elem(), fieldName, flatten, true, prevTypes) + case reflect.Struct: + if t == typeOfTime || t == typeOfGeoPoint { + return nil + } + + for i := 0; i < t.NumField(); i++ { + f := t.Field(i) + + // If a named field is unexported, ignore it. An anonymous + // unexported field is processed, because it may contain + // exported fields, which are visible. + exported := (f.PkgPath == "") + if !exported && !f.Anonymous { + continue + } + + _, keep, other, err := parseTag(f.Tag) + // Handle error from parseTag now instead of later (in cache.Fields call). + if err != nil { + return err + } + if !keep { + continue + } + if other != nil { + opts := other.(saveOpts) + flatten = flatten || opts.flatten + } + if err := validateChildType(f.Type, f.Name, flatten, prevSlice, prevTypes); err != nil { + return err + } + } + case reflect.Ptr: + if t == typeOfKeyPtr { + return nil + } + return validateChildType(t.Elem(), fieldName, flatten, prevSlice, prevTypes) + } + return nil +} + +// isLeafType determines whether or not a type is a 'leaf type' +// and should not be recursed into, but considered one field. +func isLeafType(t reflect.Type) bool { + return t == typeOfTime || t == typeOfGeoPoint +} + +// structCache collects the structs whose fields have already been calculated. +var structCache = fields.NewCache(parseTag, validateType, isLeafType) + +// structPLS adapts a struct to be a PropertyLoadSaver. +type structPLS struct { + v reflect.Value + codec fields.List +} + +// newStructPLS returns a structPLS, which implements the +// PropertyLoadSaver interface, for the struct pointer p. +func newStructPLS(p interface{}) (*structPLS, error) { + v := reflect.ValueOf(p) + if v.Kind() != reflect.Ptr || v.Elem().Kind() != reflect.Struct { + return nil, ErrInvalidEntityType + } + v = v.Elem() + f, err := structCache.Fields(v.Type()) + if err != nil { + return nil, err + } + return &structPLS{v, f}, nil +} + +// LoadStruct loads the properties from p to dst. +// dst must be a struct pointer. +// +// The values of dst's unmatched struct fields are not modified, +// and matching slice-typed fields are not reset before appending to +// them. In particular, it is recommended to pass a pointer to a zero +// valued struct on each LoadStruct call. +func LoadStruct(dst interface{}, p []Property) error { + x, err := newStructPLS(dst) + if err != nil { + return err + } + return x.Load(p) +} + +// SaveStruct returns the properties from src as a slice of Properties. +// src must be a struct pointer. +func SaveStruct(src interface{}) ([]Property, error) { + x, err := newStructPLS(src) + if err != nil { + return nil, err + } + return x.Save() +} + +// plsForLoad tries to convert v to a PropertyLoadSaver. +// If successful, plsForLoad returns a settable v as a PropertyLoadSaver. +// +// plsForLoad is intended to be used with nested struct fields which +// may implement PropertyLoadSaver. +// +// v must be settable. +func plsForLoad(v reflect.Value) (PropertyLoadSaver, error) { + var nilPtr bool + if v.Kind() == reflect.Ptr && v.IsNil() { + nilPtr = true + v.Set(reflect.New(v.Type().Elem())) + } + + vpls, err := pls(v) + if nilPtr && (vpls == nil || err != nil) { + // unset v + v.Set(reflect.Zero(v.Type())) + } + + return vpls, err +} + +// plsForSave tries to convert v to a PropertyLoadSaver. +// If successful, plsForSave returns v as a PropertyLoadSaver. +// +// plsForSave is intended to be used with nested struct fields which +// may implement PropertyLoadSaver. +// +// v must be settable. +func plsForSave(v reflect.Value) (PropertyLoadSaver, error) { + switch v.Kind() { + case reflect.Ptr, reflect.Slice, reflect.Map, reflect.Interface, reflect.Chan, reflect.Func: + // If v is nil, return early. v contains no data to save. + if v.IsNil() { + return nil, nil + } + } + + return pls(v) +} + +func pls(v reflect.Value) (PropertyLoadSaver, error) { + if v.Kind() != reflect.Ptr { + if _, ok := v.Interface().(PropertyLoadSaver); ok { + return nil, fmt.Errorf("datastore: PropertyLoadSaver methods must be implemented on a pointer to %T", v.Interface()) + } + + v = v.Addr() + } + + vpls, _ := v.Interface().(PropertyLoadSaver) + return vpls, nil +} diff --git a/vendor/cloud.google.com/go/datastore/query.go b/vendor/cloud.google.com/go/datastore/query.go new file mode 100644 index 000000000000..5851662d66db --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/query.go @@ -0,0 +1,786 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "context" + "encoding/base64" + "errors" + "fmt" + "math" + "reflect" + "strconv" + "strings" + + "cloud.google.com/go/internal/trace" + wrapperspb "github.com/golang/protobuf/ptypes/wrappers" + "google.golang.org/api/iterator" + pb "google.golang.org/genproto/googleapis/datastore/v1" +) + +type operator int + +const ( + lessThan operator = iota + 1 + lessEq + equal + greaterEq + greaterThan + + keyFieldName = "__key__" +) + +var operatorToProto = map[operator]pb.PropertyFilter_Operator{ + lessThan: pb.PropertyFilter_LESS_THAN, + lessEq: pb.PropertyFilter_LESS_THAN_OR_EQUAL, + equal: pb.PropertyFilter_EQUAL, + greaterEq: pb.PropertyFilter_GREATER_THAN_OR_EQUAL, + greaterThan: pb.PropertyFilter_GREATER_THAN, +} + +// filter is a conditional filter on query results. +type filter struct { + FieldName string + Op operator + Value interface{} +} + +type sortDirection bool + +const ( + ascending sortDirection = false + descending sortDirection = true +) + +var sortDirectionToProto = map[sortDirection]pb.PropertyOrder_Direction{ + ascending: pb.PropertyOrder_ASCENDING, + descending: pb.PropertyOrder_DESCENDING, +} + +// order is a sort order on query results. +type order struct { + FieldName string + Direction sortDirection +} + +// NewQuery creates a new Query for a specific entity kind. +// +// An empty kind means to return all entities, including entities created and +// managed by other App Engine features, and is called a kindless query. +// Kindless queries cannot include filters or sort orders on property values. +func NewQuery(kind string) *Query { + return &Query{ + kind: kind, + limit: -1, + } +} + +// Query represents a datastore query. +type Query struct { + kind string + ancestor *Key + filter []filter + order []order + projection []string + + distinct bool + distinctOn []string + keysOnly bool + eventual bool + limit int32 + offset int32 + start []byte + end []byte + + namespace string + + trans *Transaction + + err error +} + +func (q *Query) clone() *Query { + x := *q + // Copy the contents of the slice-typed fields to a new backing store. + if len(q.filter) > 0 { + x.filter = make([]filter, len(q.filter)) + copy(x.filter, q.filter) + } + if len(q.order) > 0 { + x.order = make([]order, len(q.order)) + copy(x.order, q.order) + } + return &x +} + +// Ancestor returns a derivative query with an ancestor filter. +// The ancestor should not be nil. +func (q *Query) Ancestor(ancestor *Key) *Query { + q = q.clone() + if ancestor == nil { + q.err = errors.New("datastore: nil query ancestor") + return q + } + q.ancestor = ancestor + return q +} + +// EventualConsistency returns a derivative query that returns eventually +// consistent results. +// It only has an effect on ancestor queries. +func (q *Query) EventualConsistency() *Query { + q = q.clone() + q.eventual = true + return q +} + +// Namespace returns a derivative query that is associated with the given +// namespace. +// +// A namespace may be used to partition data for multi-tenant applications. +// For details, see https://cloud.google.com/datastore/docs/concepts/multitenancy. +func (q *Query) Namespace(ns string) *Query { + q = q.clone() + q.namespace = ns + return q +} + +// Transaction returns a derivative query that is associated with the given +// transaction. +// +// All reads performed as part of the transaction will come from a single +// consistent snapshot. Furthermore, if the transaction is set to a +// serializable isolation level, another transaction cannot concurrently modify +// the data that is read or modified by this transaction. +func (q *Query) Transaction(t *Transaction) *Query { + q = q.clone() + q.trans = t + return q +} + +// Filter returns a derivative query with a field-based filter. +// The filterStr argument must be a field name followed by optional space, +// followed by an operator, one of ">", "<", ">=", "<=", or "=". +// Fields are compared against the provided value using the operator. +// Multiple filters are AND'ed together. +// Field names which contain spaces, quote marks, or operator characters +// should be passed as quoted Go string literals as returned by strconv.Quote +// or the fmt package's %q verb. +func (q *Query) Filter(filterStr string, value interface{}) *Query { + q = q.clone() + filterStr = strings.TrimSpace(filterStr) + if filterStr == "" { + q.err = fmt.Errorf("datastore: invalid filter %q", filterStr) + return q + } + f := filter{ + FieldName: strings.TrimRight(filterStr, " ><=!"), + Value: value, + } + switch op := strings.TrimSpace(filterStr[len(f.FieldName):]); op { + case "<=": + f.Op = lessEq + case ">=": + f.Op = greaterEq + case "<": + f.Op = lessThan + case ">": + f.Op = greaterThan + case "=": + f.Op = equal + default: + q.err = fmt.Errorf("datastore: invalid operator %q in filter %q", op, filterStr) + return q + } + var err error + f.FieldName, err = unquote(f.FieldName) + if err != nil { + q.err = fmt.Errorf("datastore: invalid syntax for quoted field name %q", f.FieldName) + return q + } + q.filter = append(q.filter, f) + return q +} + +// Order returns a derivative query with a field-based sort order. Orders are +// applied in the order they are added. The default order is ascending; to sort +// in descending order prefix the fieldName with a minus sign (-). +// Field names which contain spaces, quote marks, or the minus sign +// should be passed as quoted Go string literals as returned by strconv.Quote +// or the fmt package's %q verb. +func (q *Query) Order(fieldName string) *Query { + q = q.clone() + fieldName, dir := strings.TrimSpace(fieldName), ascending + if strings.HasPrefix(fieldName, "-") { + fieldName, dir = strings.TrimSpace(fieldName[1:]), descending + } else if strings.HasPrefix(fieldName, "+") { + q.err = fmt.Errorf("datastore: invalid order: %q", fieldName) + return q + } + fieldName, err := unquote(fieldName) + if err != nil { + q.err = fmt.Errorf("datastore: invalid syntax for quoted field name %q", fieldName) + return q + } + if fieldName == "" { + q.err = errors.New("datastore: empty order") + return q + } + q.order = append(q.order, order{ + Direction: dir, + FieldName: fieldName, + }) + return q +} + +// unquote optionally interprets s as a double-quoted or backquoted Go +// string literal if it begins with the relevant character. +func unquote(s string) (string, error) { + if s == "" || (s[0] != '`' && s[0] != '"') { + return s, nil + } + return strconv.Unquote(s) +} + +// Project returns a derivative query that yields only the given fields. It +// cannot be used with KeysOnly. +func (q *Query) Project(fieldNames ...string) *Query { + q = q.clone() + q.projection = append([]string(nil), fieldNames...) + return q +} + +// Distinct returns a derivative query that yields de-duplicated entities with +// respect to the set of projected fields. It is only used for projection +// queries. Distinct cannot be used with DistinctOn. +func (q *Query) Distinct() *Query { + q = q.clone() + q.distinct = true + return q +} + +// DistinctOn returns a derivative query that yields de-duplicated entities with +// respect to the set of the specified fields. It is only used for projection +// queries. The field list should be a subset of the projected field list. +// DistinctOn cannot be used with Distinct. +func (q *Query) DistinctOn(fieldNames ...string) *Query { + q = q.clone() + q.distinctOn = fieldNames + return q +} + +// KeysOnly returns a derivative query that yields only keys, not keys and +// entities. It cannot be used with projection queries. +func (q *Query) KeysOnly() *Query { + q = q.clone() + q.keysOnly = true + return q +} + +// Limit returns a derivative query that has a limit on the number of results +// returned. A negative value means unlimited. +func (q *Query) Limit(limit int) *Query { + q = q.clone() + if limit < math.MinInt32 || limit > math.MaxInt32 { + q.err = errors.New("datastore: query limit overflow") + return q + } + q.limit = int32(limit) + return q +} + +// Offset returns a derivative query that has an offset of how many keys to +// skip over before returning results. A negative value is invalid. +func (q *Query) Offset(offset int) *Query { + q = q.clone() + if offset < 0 { + q.err = errors.New("datastore: negative query offset") + return q + } + if offset > math.MaxInt32 { + q.err = errors.New("datastore: query offset overflow") + return q + } + q.offset = int32(offset) + return q +} + +// Start returns a derivative query with the given start point. +func (q *Query) Start(c Cursor) *Query { + q = q.clone() + q.start = c.cc + return q +} + +// End returns a derivative query with the given end point. +func (q *Query) End(c Cursor) *Query { + q = q.clone() + q.end = c.cc + return q +} + +// toProto converts the query to a protocol buffer. +func (q *Query) toProto(req *pb.RunQueryRequest) error { + if len(q.projection) != 0 && q.keysOnly { + return errors.New("datastore: query cannot both project and be keys-only") + } + if len(q.distinctOn) != 0 && q.distinct { + return errors.New("datastore: query cannot be both distinct and distinct-on") + } + dst := &pb.Query{} + if q.kind != "" { + dst.Kind = []*pb.KindExpression{{Name: q.kind}} + } + if q.projection != nil { + for _, propertyName := range q.projection { + dst.Projection = append(dst.Projection, &pb.Projection{Property: &pb.PropertyReference{Name: propertyName}}) + } + + for _, propertyName := range q.distinctOn { + dst.DistinctOn = append(dst.DistinctOn, &pb.PropertyReference{Name: propertyName}) + } + + if q.distinct { + for _, propertyName := range q.projection { + dst.DistinctOn = append(dst.DistinctOn, &pb.PropertyReference{Name: propertyName}) + } + } + } + if q.keysOnly { + dst.Projection = []*pb.Projection{{Property: &pb.PropertyReference{Name: keyFieldName}}} + } + + var filters []*pb.Filter + for _, qf := range q.filter { + if qf.FieldName == "" { + return errors.New("datastore: empty query filter field name") + } + v, err := interfaceToProto(reflect.ValueOf(qf.Value).Interface(), false) + if err != nil { + return fmt.Errorf("datastore: bad query filter value type: %v", err) + } + op, ok := operatorToProto[qf.Op] + if !ok { + return errors.New("datastore: unknown query filter operator") + } + xf := &pb.PropertyFilter{ + Op: op, + Property: &pb.PropertyReference{Name: qf.FieldName}, + Value: v, + } + filters = append(filters, &pb.Filter{ + FilterType: &pb.Filter_PropertyFilter{PropertyFilter: xf}, + }) + } + + if q.ancestor != nil { + filters = append(filters, &pb.Filter{ + FilterType: &pb.Filter_PropertyFilter{PropertyFilter: &pb.PropertyFilter{ + Property: &pb.PropertyReference{Name: keyFieldName}, + Op: pb.PropertyFilter_HAS_ANCESTOR, + Value: &pb.Value{ValueType: &pb.Value_KeyValue{KeyValue: keyToProto(q.ancestor)}}, + }}}) + } + + if len(filters) == 1 { + dst.Filter = filters[0] + } else if len(filters) > 1 { + dst.Filter = &pb.Filter{FilterType: &pb.Filter_CompositeFilter{CompositeFilter: &pb.CompositeFilter{ + Op: pb.CompositeFilter_AND, + Filters: filters, + }}} + } + + for _, qo := range q.order { + if qo.FieldName == "" { + return errors.New("datastore: empty query order field name") + } + xo := &pb.PropertyOrder{ + Property: &pb.PropertyReference{Name: qo.FieldName}, + Direction: sortDirectionToProto[qo.Direction], + } + dst.Order = append(dst.Order, xo) + } + if q.limit >= 0 { + dst.Limit = &wrapperspb.Int32Value{Value: q.limit} + } + dst.Offset = q.offset + dst.StartCursor = q.start + dst.EndCursor = q.end + + if t := q.trans; t != nil { + if t.id == nil { + return errExpiredTransaction + } + if q.eventual { + return errors.New("datastore: cannot use EventualConsistency query in a transaction") + } + req.ReadOptions = &pb.ReadOptions{ + ConsistencyType: &pb.ReadOptions_Transaction{Transaction: t.id}, + } + } + + if q.eventual { + req.ReadOptions = &pb.ReadOptions{ConsistencyType: &pb.ReadOptions_ReadConsistency_{ReadConsistency: pb.ReadOptions_EVENTUAL}} + } + + req.QueryType = &pb.RunQueryRequest_Query{Query: dst} + return nil +} + +// Count returns the number of results for the given query. +// +// The running time and number of API calls made by Count scale linearly with +// the sum of the query's offset and limit. Unless the result count is +// expected to be small, it is best to specify a limit; otherwise Count will +// continue until it finishes counting or the provided context expires. +func (c *Client) Count(ctx context.Context, q *Query) (n int, err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.Query.Count") + defer func() { trace.EndSpan(ctx, err) }() + + // Check that the query is well-formed. + if q.err != nil { + return 0, q.err + } + + // Create a copy of the query, with keysOnly true (if we're not a projection, + // since the two are incompatible). + newQ := q.clone() + newQ.keysOnly = len(newQ.projection) == 0 + + // Create an iterator and use it to walk through the batches of results + // directly. + it := c.Run(ctx, newQ) + for { + err := it.nextBatch() + if err == iterator.Done { + return n, nil + } + if err != nil { + return 0, err + } + n += len(it.results) + } +} + +// GetAll runs the provided query in the given context and returns all keys +// that match that query, as well as appending the values to dst. +// +// dst must have type *[]S or *[]*S or *[]P, for some struct type S or some non- +// interface, non-pointer type P such that P or *P implements PropertyLoadSaver. +// +// As a special case, *PropertyList is an invalid type for dst, even though a +// PropertyList is a slice of structs. It is treated as invalid to avoid being +// mistakenly passed when *[]PropertyList was intended. +// +// The keys returned by GetAll will be in a 1-1 correspondence with the entities +// added to dst. +// +// If q is a ``keys-only'' query, GetAll ignores dst and only returns the keys. +// +// The running time and number of API calls made by GetAll scale linearly with +// with the sum of the query's offset and limit. Unless the result count is +// expected to be small, it is best to specify a limit; otherwise GetAll will +// continue until it finishes collecting results or the provided context +// expires. +func (c *Client) GetAll(ctx context.Context, q *Query, dst interface{}) (keys []*Key, err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.Query.GetAll") + defer func() { trace.EndSpan(ctx, err) }() + + var ( + dv reflect.Value + mat multiArgType + elemType reflect.Type + errFieldMismatch error + ) + if !q.keysOnly { + dv = reflect.ValueOf(dst) + if dv.Kind() != reflect.Ptr || dv.IsNil() { + return nil, ErrInvalidEntityType + } + dv = dv.Elem() + mat, elemType = checkMultiArg(dv) + if mat == multiArgTypeInvalid || mat == multiArgTypeInterface { + return nil, ErrInvalidEntityType + } + } + + for t := c.Run(ctx, q); ; { + k, e, err := t.next() + if err == iterator.Done { + break + } + if err != nil { + return keys, err + } + if !q.keysOnly { + ev := reflect.New(elemType) + if elemType.Kind() == reflect.Map { + // This is a special case. The zero values of a map type are + // not immediately useful; they have to be make'd. + // + // Funcs and channels are similar, in that a zero value is not useful, + // but even a freshly make'd channel isn't useful: there's no fixed + // channel buffer size that is always going to be large enough, and + // there's no goroutine to drain the other end. Theoretically, these + // types could be supported, for example by sniffing for a constructor + // method or requiring prior registration, but for now it's not a + // frequent enough concern to be worth it. Programmers can work around + // it by explicitly using Iterator.Next instead of the Query.GetAll + // convenience method. + x := reflect.MakeMap(elemType) + ev.Elem().Set(x) + } + if err = loadEntityProto(ev.Interface(), e); err != nil { + if _, ok := err.(*ErrFieldMismatch); ok { + // We continue loading entities even in the face of field mismatch errors. + // If we encounter any other error, that other error is returned. Otherwise, + // an ErrFieldMismatch is returned. + errFieldMismatch = err + } else { + return keys, err + } + } + if mat != multiArgTypeStructPtr { + ev = ev.Elem() + } + dv.Set(reflect.Append(dv, ev)) + } + keys = append(keys, k) + } + return keys, errFieldMismatch +} + +// Run runs the given query in the given context. +func (c *Client) Run(ctx context.Context, q *Query) *Iterator { + if q.err != nil { + return &Iterator{err: q.err} + } + t := &Iterator{ + ctx: ctx, + client: c, + limit: q.limit, + offset: q.offset, + keysOnly: q.keysOnly, + pageCursor: q.start, + entityCursor: q.start, + req: &pb.RunQueryRequest{ + ProjectId: c.dataset, + }, + } + + if q.namespace != "" { + t.req.PartitionId = &pb.PartitionId{ + NamespaceId: q.namespace, + } + } + + if err := q.toProto(t.req); err != nil { + t.err = err + } + return t +} + +// Iterator is the result of running a query. +type Iterator struct { + ctx context.Context + client *Client + err error + + // results is the list of EntityResults still to be iterated over from the + // most recent API call. It will be nil if no requests have yet been issued. + results []*pb.EntityResult + // req is the request to send. It may be modified and used multiple times. + req *pb.RunQueryRequest + + // limit is the limit on the number of results this iterator should return. + // The zero value is used to prevent further fetches from the server. + // A negative value means unlimited. + limit int32 + // offset is the number of results that still need to be skipped. + offset int32 + // keysOnly records whether the query was keys-only (skip entity loading). + keysOnly bool + + // pageCursor is the compiled cursor for the next batch/page of result. + // TODO(djd): Can we delete this in favour of paging with the last + // entityCursor from each batch? + pageCursor []byte + // entityCursor is the compiled cursor of the next result. + entityCursor []byte +} + +// Next returns the key of the next result. When there are no more results, +// iterator.Done is returned as the error. +// +// If the query is not keys only and dst is non-nil, it also loads the entity +// stored for that key into the struct pointer or PropertyLoadSaver dst, with +// the same semantics and possible errors as for the Get function. +func (t *Iterator) Next(dst interface{}) (k *Key, err error) { + k, e, err := t.next() + if err != nil { + return nil, err + } + if dst != nil && !t.keysOnly { + err = loadEntityProto(dst, e) + } + return k, err +} + +func (t *Iterator) next() (*Key, *pb.Entity, error) { + // Fetch additional batches while there are no more results. + for t.err == nil && len(t.results) == 0 { + t.err = t.nextBatch() + } + if t.err != nil { + return nil, nil, t.err + } + + // Extract the next result, update cursors, and parse the entity's key. + e := t.results[0] + t.results = t.results[1:] + t.entityCursor = e.Cursor + if len(t.results) == 0 { + t.entityCursor = t.pageCursor // At the end of the batch. + } + if e.Entity.Key == nil { + return nil, nil, errors.New("datastore: internal error: server did not return a key") + } + k, err := protoToKey(e.Entity.Key) + if err != nil || k.Incomplete() { + return nil, nil, errors.New("datastore: internal error: server returned an invalid key") + } + + return k, e.Entity, nil +} + +// nextBatch makes a single call to the server for a batch of results. +func (t *Iterator) nextBatch() error { + if t.err != nil { + return t.err + } + + if t.limit == 0 { + return iterator.Done // Short-circuits the zero-item response. + } + + // Adjust the query with the latest start cursor, limit and offset. + q := t.req.GetQuery() + q.StartCursor = t.pageCursor + q.Offset = t.offset + if t.limit >= 0 { + q.Limit = &wrapperspb.Int32Value{Value: t.limit} + } else { + q.Limit = nil + } + + // Run the query. + resp, err := t.client.client.RunQuery(t.ctx, t.req) + if err != nil { + return err + } + + // Adjust any offset from skipped results. + skip := resp.Batch.SkippedResults + if skip < 0 { + return errors.New("datastore: internal error: negative number of skipped_results") + } + t.offset -= skip + if t.offset < 0 { + return errors.New("datastore: internal error: query skipped too many results") + } + if t.offset > 0 && len(resp.Batch.EntityResults) > 0 { + return errors.New("datastore: internal error: query returned results before requested offset") + } + + // Adjust the limit. + if t.limit >= 0 { + t.limit -= int32(len(resp.Batch.EntityResults)) + if t.limit < 0 { + return errors.New("datastore: internal error: query returned more results than the limit") + } + } + + // If there are no more results available, set limit to zero to prevent + // further fetches. Otherwise, check that there is a next page cursor available. + if resp.Batch.MoreResults != pb.QueryResultBatch_NOT_FINISHED { + t.limit = 0 + } else if resp.Batch.EndCursor == nil { + return errors.New("datastore: internal error: server did not return a cursor") + } + + // Update cursors. + // If any results were skipped, use the SkippedCursor as the next entity cursor. + if skip > 0 { + t.entityCursor = resp.Batch.SkippedCursor + } else { + t.entityCursor = q.StartCursor + } + t.pageCursor = resp.Batch.EndCursor + + t.results = resp.Batch.EntityResults + return nil +} + +// Cursor returns a cursor for the iterator's current location. +func (t *Iterator) Cursor() (c Cursor, err error) { + t.ctx = trace.StartSpan(t.ctx, "cloud.google.com/go/datastore.Query.Cursor") + defer func() { trace.EndSpan(t.ctx, err) }() + + // If there is still an offset, we need to the skip those results first. + for t.err == nil && t.offset > 0 { + t.err = t.nextBatch() + } + + if t.err != nil && t.err != iterator.Done { + return Cursor{}, t.err + } + + return Cursor{t.entityCursor}, nil +} + +// Cursor is an iterator's position. It can be converted to and from an opaque +// string. A cursor can be used from different HTTP requests, but only with a +// query with the same kind, ancestor, filter and order constraints. +// +// The zero Cursor can be used to indicate that there is no start and/or end +// constraint for a query. +type Cursor struct { + cc []byte +} + +// String returns a base-64 string representation of a cursor. +func (c Cursor) String() string { + if c.cc == nil { + return "" + } + + return strings.TrimRight(base64.URLEncoding.EncodeToString(c.cc), "=") +} + +// DecodeCursor decodes a cursor from its base-64 string representation. +func DecodeCursor(s string) (Cursor, error) { + if s == "" { + return Cursor{}, nil + } + if n := len(s) % 4; n != 0 { + s += strings.Repeat("=", 4-n) + } + b, err := base64.URLEncoding.DecodeString(s) + if err != nil { + return Cursor{}, err + } + return Cursor{b}, nil +} diff --git a/vendor/cloud.google.com/go/datastore/save.go b/vendor/cloud.google.com/go/datastore/save.go new file mode 100644 index 000000000000..d92aeff5ae18 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/save.go @@ -0,0 +1,484 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "errors" + "fmt" + "reflect" + "time" + "unicode/utf8" + + timepb "github.com/golang/protobuf/ptypes/timestamp" + pb "google.golang.org/genproto/googleapis/datastore/v1" + llpb "google.golang.org/genproto/googleapis/type/latlng" +) + +type saveOpts struct { + noIndex bool + flatten bool + omitEmpty bool +} + +// saveEntity saves an EntityProto into a PropertyLoadSaver or struct pointer. +func saveEntity(key *Key, src interface{}) (*pb.Entity, error) { + var err error + var props []Property + if e, ok := src.(PropertyLoadSaver); ok { + props, err = e.Save() + } else { + props, err = SaveStruct(src) + } + if err != nil { + return nil, err + } + return propertiesToProto(key, props) +} + +// reflectFieldSave extracts the underlying value of v by reflection, +// and tries to extract a Property that'll be appended to props. +func reflectFieldSave(props *[]Property, p Property, name string, opts saveOpts, v reflect.Value) error { + switch x := v.Interface().(type) { + case *Key, time.Time, GeoPoint: + p.Value = x + default: + switch v.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + p.Value = v.Int() + case reflect.Bool: + p.Value = v.Bool() + case reflect.String: + p.Value = v.String() + case reflect.Float32, reflect.Float64: + p.Value = v.Float() + + case reflect.Interface: + // Extract the interface's underlying value and then retry the save. + // See issue https://github.com/googleapis/google-cloud-go/issues/1474. + v = v.Elem() + return reflectFieldSave(props, p, name, opts, v) + + case reflect.Slice: + if v.Type().Elem().Kind() == reflect.Uint8 { + p.Value = v.Bytes() + } else { + return saveSliceProperty(props, name, opts, v) + } + case reflect.Ptr: + if isValidPointerType(v.Type().Elem()) { + if v.IsNil() { + // Nil pointer becomes a nil property value (unless omitempty, handled above). + p.Value = nil + *props = append(*props, p) + return nil + } + // When we recurse on the derefenced pointer, omitempty no longer applies: + // we already know the pointer is not empty, it doesn't matter if its referent + // is empty or not. + opts.omitEmpty = false + return saveStructProperty(props, name, opts, v.Elem()) + } + if v.Type().Elem().Kind() != reflect.Struct { + return fmt.Errorf("datastore: unsupported struct field type: %s", v.Type()) + } + // Pointer to struct is a special case. + if v.IsNil() { + return nil + } + v = v.Elem() + fallthrough + case reflect.Struct: + if !v.CanAddr() { + return fmt.Errorf("datastore: unsupported struct field: value is unaddressable") + } + vi := v.Addr().Interface() + + sub, err := newStructPLS(vi) + if err != nil { + return fmt.Errorf("datastore: unsupported struct field: %v", err) + } + + if opts.flatten { + return sub.save(props, opts, name+".") + } + + var subProps []Property + err = sub.save(&subProps, opts, "") + if err != nil { + return err + } + subKey, err := sub.key(v) + if err != nil { + return err + } + + p.Value = &Entity{ + Key: subKey, + Properties: subProps, + } + } + } + + if p.Value == nil { + return fmt.Errorf("datastore: unsupported struct field type: %v", v.Type()) + } + *props = append(*props, p) + return nil +} + +// TODO(djd): Convert this and below to return ([]Property, error). +func saveStructProperty(props *[]Property, name string, opts saveOpts, v reflect.Value) error { + p := Property{ + Name: name, + NoIndex: opts.noIndex, + } + + if opts.omitEmpty && isEmptyValue(v) { + return nil + } + + // First check if field type implements PLS. If so, use PLS to + // save. + ok, err := plsFieldSave(props, p, name, opts, v) + if err != nil { + return err + } + if ok { + return nil + } + + return reflectFieldSave(props, p, name, opts, v) +} + +// plsFieldSave first tries to converts v's value to a PLS, then v's addressed +// value to a PLS. If neither succeeds, plsFieldSave returns false for first return +// value. +// If v is successfully converted to a PLS, plsFieldSave will then add the +// Value to property p by way of the PLS's Save method, and append it to props. +// +// If the flatten option is present in opts, name must be prepended to each property's +// name before it is appended to props. Eg. if name were "A" and a subproperty's name +// were "B", the resultant name of the property to be appended to props would be "A.B". +func plsFieldSave(props *[]Property, p Property, name string, opts saveOpts, v reflect.Value) (ok bool, err error) { + vpls, err := plsForSave(v) + if err != nil { + return false, err + } + + if vpls == nil { + return false, nil + } + + subProps, err := vpls.Save() + if err != nil { + return true, err + } + + if opts.flatten { + for _, subp := range subProps { + subp.Name = name + "." + subp.Name + *props = append(*props, subp) + } + return true, nil + } + + p.Value = &Entity{Properties: subProps} + *props = append(*props, p) + + return true, nil +} + +// key extracts the *Key struct field from struct v based on the structCodec of s. +func (s structPLS) key(v reflect.Value) (*Key, error) { + if v.Kind() != reflect.Struct { + return nil, errors.New("datastore: cannot save key of non-struct type") + } + + keyField := s.codec.Match(keyFieldName) + + if keyField == nil { + return nil, nil + } + + f := v.FieldByIndex(keyField.Index) + k, ok := f.Interface().(*Key) + if !ok { + return nil, fmt.Errorf("datastore: %s field on struct %T is not a *datastore.Key", keyFieldName, v.Interface()) + } + + return k, nil +} + +func saveSliceProperty(props *[]Property, name string, opts saveOpts, v reflect.Value) error { + // Easy case: if the slice is empty, we're done. + if v.Len() == 0 { + return nil + } + // Work out the properties generated by the first element in the slice. This will + // usually be a single property, but will be more if this is a slice of structs. + var headProps []Property + if err := saveStructProperty(&headProps, name, opts, v.Index(0)); err != nil { + return err + } + + // Convert the first element's properties into slice properties, and + // keep track of the values in a map. + values := make(map[string][]interface{}, len(headProps)) + for _, p := range headProps { + values[p.Name] = append(make([]interface{}, 0, v.Len()), p.Value) + } + + // Find the elements for the subsequent elements. + for i := 1; i < v.Len(); i++ { + elemProps := make([]Property, 0, len(headProps)) + if err := saveStructProperty(&elemProps, name, opts, v.Index(i)); err != nil { + return err + } + for _, p := range elemProps { + v, ok := values[p.Name] + if !ok { + return fmt.Errorf("datastore: unexpected property %q in elem %d of slice", p.Name, i) + } + values[p.Name] = append(v, p.Value) + } + } + + // Convert to the final properties. + for _, p := range headProps { + p.Value = values[p.Name] + *props = append(*props, p) + } + return nil +} + +func (s structPLS) Save() ([]Property, error) { + var props []Property + if err := s.save(&props, saveOpts{}, ""); err != nil { + return nil, err + } + return props, nil +} + +func (s structPLS) save(props *[]Property, opts saveOpts, prefix string) error { + for _, f := range s.codec { + name := prefix + f.Name + v := getField(s.v, f.Index) + if !v.IsValid() || !v.CanSet() { + continue + } + + var tagOpts saveOpts + if f.ParsedTag != nil { + tagOpts = f.ParsedTag.(saveOpts) + } + + var opts1 saveOpts + opts1.noIndex = opts.noIndex || tagOpts.noIndex + opts1.flatten = opts.flatten || tagOpts.flatten + opts1.omitEmpty = tagOpts.omitEmpty // don't propagate + if err := saveStructProperty(props, name, opts1, v); err != nil { + return err + } + } + return nil +} + +// getField returns the field from v at the given index path. +// If it encounters a nil-valued field in the path, getField +// stops and returns a zero-valued reflect.Value, preventing the +// panic that would have been caused by reflect's FieldByIndex. +func getField(v reflect.Value, index []int) reflect.Value { + var zero reflect.Value + if v.Type().Kind() != reflect.Struct { + return zero + } + + for _, i := range index { + if v.Kind() == reflect.Ptr && v.Type().Elem().Kind() == reflect.Struct { + if v.IsNil() { + return zero + } + v = v.Elem() + } + v = v.Field(i) + } + return v +} + +func propertiesToProto(key *Key, props []Property) (*pb.Entity, error) { + e := &pb.Entity{ + Key: keyToProto(key), + Properties: map[string]*pb.Value{}, + } + indexedProps := 0 + for _, p := range props { + // Do not send a Key value a field to datastore. + if p.Name == keyFieldName { + continue + } + + val, err := interfaceToProto(p.Value, p.NoIndex) + if err != nil { + return nil, fmt.Errorf("datastore: %v for a Property with Name %q", err, p.Name) + } + if !p.NoIndex { + rVal := reflect.ValueOf(p.Value) + if rVal.Kind() == reflect.Slice && rVal.Type().Elem().Kind() != reflect.Uint8 { + indexedProps += rVal.Len() + } else { + indexedProps++ + } + } + if indexedProps > maxIndexedProperties { + return nil, errors.New("datastore: too many indexed properties") + } + + if _, ok := e.Properties[p.Name]; ok { + return nil, fmt.Errorf("datastore: duplicate Property with Name %q", p.Name) + } + e.Properties[p.Name] = val + } + return e, nil +} + +func interfaceToProto(iv interface{}, noIndex bool) (*pb.Value, error) { + val := &pb.Value{ExcludeFromIndexes: noIndex} + switch v := iv.(type) { + case int: + val.ValueType = &pb.Value_IntegerValue{IntegerValue: int64(v)} + case int32: + val.ValueType = &pb.Value_IntegerValue{IntegerValue: int64(v)} + case int64: + val.ValueType = &pb.Value_IntegerValue{IntegerValue: v} + case bool: + val.ValueType = &pb.Value_BooleanValue{BooleanValue: v} + case string: + if len(v) > 1500 && !noIndex { + return nil, errors.New("string property too long to index") + } + if !utf8.ValidString(v) { + return nil, fmt.Errorf("string is not valid utf8: %q", v) + } + val.ValueType = &pb.Value_StringValue{StringValue: v} + case float32: + val.ValueType = &pb.Value_DoubleValue{DoubleValue: float64(v)} + case float64: + val.ValueType = &pb.Value_DoubleValue{DoubleValue: v} + case *Key: + if v == nil { + val.ValueType = &pb.Value_NullValue{} + } else { + val.ValueType = &pb.Value_KeyValue{KeyValue: keyToProto(v)} + } + case GeoPoint: + if !v.Valid() { + return nil, errors.New("invalid GeoPoint value") + } + val.ValueType = &pb.Value_GeoPointValue{GeoPointValue: &llpb.LatLng{ + Latitude: v.Lat, + Longitude: v.Lng, + }} + case time.Time: + if v.Before(minTime) || v.After(maxTime) { + return nil, errors.New("time value out of range") + } + val.ValueType = &pb.Value_TimestampValue{TimestampValue: &timepb.Timestamp{ + Seconds: v.Unix(), + Nanos: int32(v.Nanosecond()), + }} + case []byte: + if len(v) > 1500 && !noIndex { + return nil, errors.New("[]byte property too long to index") + } + val.ValueType = &pb.Value_BlobValue{BlobValue: v} + case *Entity: + e, err := propertiesToProto(v.Key, v.Properties) + if err != nil { + return nil, err + } + val.ValueType = &pb.Value_EntityValue{EntityValue: e} + case []interface{}: + arr := make([]*pb.Value, 0, len(v)) + for i, v := range v { + elem, err := interfaceToProto(v, noIndex) + if err != nil { + return nil, fmt.Errorf("%v at index %d", err, i) + } + arr = append(arr, elem) + } + val.ValueType = &pb.Value_ArrayValue{ArrayValue: &pb.ArrayValue{Values: arr}} + // ArrayValues have ExcludeFromIndexes set on the individual items, rather + // than the top-level value. + val.ExcludeFromIndexes = false + default: + rv := reflect.ValueOf(iv) + if !rv.IsValid() { + val.ValueType = &pb.Value_NullValue{} + } else if rv.Kind() == reflect.Ptr { // non-nil pointer: dereference + if rv.IsNil() { + val.ValueType = &pb.Value_NullValue{} + return val, nil + } + return interfaceToProto(rv.Elem().Interface(), noIndex) + } else { + return nil, fmt.Errorf("invalid Value type %T", iv) + } + } + // TODO(jbd): Support EntityValue. + return val, nil +} + +// isEmptyValue is taken from the encoding/json package in the +// standard library. +func isEmptyValue(v reflect.Value) bool { + switch v.Kind() { + case reflect.Array, reflect.Map, reflect.Slice, reflect.String: + return v.Len() == 0 + case reflect.Bool: + return !v.Bool() + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return v.Int() == 0 + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + return v.Uint() == 0 + case reflect.Float32, reflect.Float64: + return v.Float() == 0 + case reflect.Interface, reflect.Ptr: + return v.IsNil() + case reflect.Struct: + if t, ok := v.Interface().(time.Time); ok { + return t.IsZero() + } + } + return false +} + +// isValidPointerType reports whether a struct field can be a pointer to type t +// for the purposes of saving and loading. +func isValidPointerType(t reflect.Type) bool { + if t == typeOfTime || t == typeOfGeoPoint { + return true + } + switch t.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return true + case reflect.Bool: + return true + case reflect.String: + return true + case reflect.Float32, reflect.Float64: + return true + } + return false +} diff --git a/vendor/cloud.google.com/go/datastore/time.go b/vendor/cloud.google.com/go/datastore/time.go new file mode 100644 index 000000000000..da6c780daa77 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/time.go @@ -0,0 +1,36 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "math" + "time" +) + +var ( + minTime = time.Unix(int64(math.MinInt64)/1e6, (int64(math.MinInt64)%1e6)*1e3) + maxTime = time.Unix(int64(math.MaxInt64)/1e6, (int64(math.MaxInt64)%1e6)*1e3) +) + +func toUnixMicro(t time.Time) int64 { + // We cannot use t.UnixNano() / 1e3 because we want to handle times more than + // 2^63 nanoseconds (which is about 292 years) away from 1970, and those cannot + // be represented in the numerator of a single int64 divide. + return t.Unix()*1e6 + int64(t.Nanosecond()/1e3) +} + +func fromUnixMicro(t int64) time.Time { + return time.Unix(t/1e6, (t%1e6)*1e3) +} diff --git a/vendor/cloud.google.com/go/datastore/transaction.go b/vendor/cloud.google.com/go/datastore/transaction.go new file mode 100644 index 000000000000..328e58f303f8 --- /dev/null +++ b/vendor/cloud.google.com/go/datastore/transaction.go @@ -0,0 +1,402 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datastore + +import ( + "context" + "errors" + + "cloud.google.com/go/internal/trace" + pb "google.golang.org/genproto/googleapis/datastore/v1" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +// ErrConcurrentTransaction is returned when a transaction is rolled back due +// to a conflict with a concurrent transaction. +var ErrConcurrentTransaction = errors.New("datastore: concurrent transaction") + +var errExpiredTransaction = errors.New("datastore: transaction expired") + +type transactionSettings struct { + attempts int + readOnly bool + prevID []byte // ID of the transaction to retry +} + +// newTransactionSettings creates a transactionSettings with a given TransactionOption slice. +// Unconfigured options will be set to default values. +func newTransactionSettings(opts []TransactionOption) *transactionSettings { + s := &transactionSettings{attempts: 3} + for _, o := range opts { + o.apply(s) + } + return s +} + +// TransactionOption configures the way a transaction is executed. +type TransactionOption interface { + apply(*transactionSettings) +} + +// MaxAttempts returns a TransactionOption that overrides the default 3 attempt times. +func MaxAttempts(attempts int) TransactionOption { + return maxAttempts(attempts) +} + +type maxAttempts int + +func (w maxAttempts) apply(s *transactionSettings) { + if w > 0 { + s.attempts = int(w) + } +} + +// ReadOnly is a TransactionOption that marks the transaction as read-only. +var ReadOnly TransactionOption + +func init() { + ReadOnly = readOnly{} +} + +type readOnly struct{} + +func (readOnly) apply(s *transactionSettings) { + s.readOnly = true +} + +// Transaction represents a set of datastore operations to be committed atomically. +// +// Operations are enqueued by calling the Put and Delete methods on Transaction +// (or their Multi-equivalents). These operations are only committed when the +// Commit method is invoked. To ensure consistency, reads must be performed by +// using Transaction's Get method or by using the Transaction method when +// building a query. +// +// A Transaction must be committed or rolled back exactly once. +type Transaction struct { + id []byte + client *Client + ctx context.Context + mutations []*pb.Mutation // The mutations to apply. + pending map[int]*PendingKey // Map from mutation index to incomplete keys pending transaction completion. +} + +// NewTransaction starts a new transaction. +func (c *Client) NewTransaction(ctx context.Context, opts ...TransactionOption) (t *Transaction, err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.NewTransaction") + defer func() { trace.EndSpan(ctx, err) }() + + for _, o := range opts { + if _, ok := o.(maxAttempts); ok { + return nil, errors.New("datastore: NewTransaction does not accept MaxAttempts option") + } + } + return c.newTransaction(ctx, newTransactionSettings(opts)) +} + +func (c *Client) newTransaction(ctx context.Context, s *transactionSettings) (*Transaction, error) { + req := &pb.BeginTransactionRequest{ProjectId: c.dataset} + if s.readOnly { + req.TransactionOptions = &pb.TransactionOptions{ + Mode: &pb.TransactionOptions_ReadOnly_{ReadOnly: &pb.TransactionOptions_ReadOnly{}}, + } + } else if s.prevID != nil { + req.TransactionOptions = &pb.TransactionOptions{ + Mode: &pb.TransactionOptions_ReadWrite_{ReadWrite: &pb.TransactionOptions_ReadWrite{ + PreviousTransaction: s.prevID, + }}, + } + } + resp, err := c.client.BeginTransaction(ctx, req) + if err != nil { + return nil, err + } + return &Transaction{ + id: resp.Transaction, + ctx: ctx, + client: c, + mutations: nil, + pending: make(map[int]*PendingKey), + }, nil +} + +// RunInTransaction runs f in a transaction. f is invoked with a Transaction +// that f should use for all the transaction's datastore operations. +// +// f must not call Commit or Rollback on the provided Transaction. +// +// If f returns nil, RunInTransaction commits the transaction, +// returning the Commit and a nil error if it succeeds. If the commit fails due +// to a conflicting transaction, RunInTransaction retries f with a new +// Transaction. It gives up and returns ErrConcurrentTransaction after three +// failed attempts (or as configured with MaxAttempts). +// +// If f returns non-nil, then the transaction will be rolled back and +// RunInTransaction will return the same error. The function f is not retried. +// +// Note that when f returns, the transaction is not committed. Calling code +// must not assume that any of f's changes have been committed until +// RunInTransaction returns nil. +// +// Since f may be called multiple times, f should usually be idempotent – that +// is, it should have the same result when called multiple times. Note that +// Transaction.Get will append when unmarshalling slice fields, so it is not +// necessarily idempotent. +func (c *Client) RunInTransaction(ctx context.Context, f func(tx *Transaction) error, opts ...TransactionOption) (cmt *Commit, err error) { + ctx = trace.StartSpan(ctx, "cloud.google.com/go/datastore.RunInTransaction") + defer func() { trace.EndSpan(ctx, err) }() + + settings := newTransactionSettings(opts) + for n := 0; n < settings.attempts; n++ { + tx, err := c.newTransaction(ctx, settings) + if err != nil { + return nil, err + } + if err := f(tx); err != nil { + _ = tx.Rollback() + return nil, err + } + if cmt, err := tx.Commit(); err != ErrConcurrentTransaction { + return cmt, err + } + // Pass this transaction's ID to the retry transaction to preserve + // transaction priority. + if !settings.readOnly { + settings.prevID = tx.id + } + } + return nil, ErrConcurrentTransaction +} + +// Commit applies the enqueued operations atomically. +func (t *Transaction) Commit() (c *Commit, err error) { + t.ctx = trace.StartSpan(t.ctx, "cloud.google.com/go/datastore.Transaction.Commit") + defer func() { trace.EndSpan(t.ctx, err) }() + + if t.id == nil { + return nil, errExpiredTransaction + } + req := &pb.CommitRequest{ + ProjectId: t.client.dataset, + TransactionSelector: &pb.CommitRequest_Transaction{Transaction: t.id}, + Mutations: t.mutations, + Mode: pb.CommitRequest_TRANSACTIONAL, + } + resp, err := t.client.client.Commit(t.ctx, req) + if status.Code(err) == codes.Aborted { + return nil, ErrConcurrentTransaction + } + t.id = nil // mark the transaction as expired + if err != nil { + return nil, err + } + + // Copy any newly minted keys into the returned keys. + for i, p := range t.pending { + if i >= len(resp.MutationResults) || resp.MutationResults[i].Key == nil { + return nil, errors.New("datastore: internal error: server returned the wrong mutation results") + } + key, err := protoToKey(resp.MutationResults[i].Key) + if err != nil { + return nil, errors.New("datastore: internal error: server returned an invalid key") + } + p.key = key + p.commit = c + } + + return c, nil +} + +// Rollback abandons a pending transaction. +func (t *Transaction) Rollback() (err error) { + t.ctx = trace.StartSpan(t.ctx, "cloud.google.com/go/datastore.Transaction.Rollback") + defer func() { trace.EndSpan(t.ctx, err) }() + + if t.id == nil { + return errExpiredTransaction + } + id := t.id + t.id = nil + _, err = t.client.client.Rollback(t.ctx, &pb.RollbackRequest{ + ProjectId: t.client.dataset, + Transaction: id, + }) + return err +} + +// Get is the transaction-specific version of the package function Get. +// All reads performed during the transaction will come from a single consistent +// snapshot. Furthermore, if the transaction is set to a serializable isolation +// level, another transaction cannot concurrently modify the data that is read +// or modified by this transaction. +func (t *Transaction) Get(key *Key, dst interface{}) (err error) { + t.ctx = trace.StartSpan(t.ctx, "cloud.google.com/go/datastore.Transaction.Get") + defer func() { trace.EndSpan(t.ctx, err) }() + + opts := &pb.ReadOptions{ + ConsistencyType: &pb.ReadOptions_Transaction{Transaction: t.id}, + } + err = t.client.get(t.ctx, []*Key{key}, []interface{}{dst}, opts) + if me, ok := err.(MultiError); ok { + return me[0] + } + return err +} + +// GetMulti is a batch version of Get. +func (t *Transaction) GetMulti(keys []*Key, dst interface{}) (err error) { + t.ctx = trace.StartSpan(t.ctx, "cloud.google.com/go/datastore.Transaction.GetMulti") + defer func() { trace.EndSpan(t.ctx, err) }() + + if t.id == nil { + return errExpiredTransaction + } + opts := &pb.ReadOptions{ + ConsistencyType: &pb.ReadOptions_Transaction{Transaction: t.id}, + } + return t.client.get(t.ctx, keys, dst, opts) +} + +// Put is the transaction-specific version of the package function Put. +// +// Put returns a PendingKey which can be resolved into a Key using the +// return value from a successful Commit. If key is an incomplete key, the +// returned pending key will resolve to a unique key generated by the +// datastore. +func (t *Transaction) Put(key *Key, src interface{}) (*PendingKey, error) { + h, err := t.PutMulti([]*Key{key}, []interface{}{src}) + if err != nil { + if me, ok := err.(MultiError); ok { + return nil, me[0] + } + return nil, err + } + return h[0], nil +} + +// PutMulti is a batch version of Put. One PendingKey is returned for each +// element of src in the same order. +// TODO(jba): rewrite in terms of Mutate. +func (t *Transaction) PutMulti(keys []*Key, src interface{}) (ret []*PendingKey, err error) { + if t.id == nil { + return nil, errExpiredTransaction + } + mutations, err := putMutations(keys, src) + if err != nil { + return nil, err + } + origin := len(t.mutations) + t.mutations = append(t.mutations, mutations...) + + // Prepare the returned handles, pre-populating where possible. + ret = make([]*PendingKey, len(keys)) + for i, key := range keys { + p := &PendingKey{} + if key.Incomplete() { + // This key will be in the final commit result. + t.pending[origin+i] = p + } else { + p.key = key + } + ret[i] = p + } + + return ret, nil +} + +// Delete is the transaction-specific version of the package function Delete. +// Delete enqueues the deletion of the entity for the given key, to be +// committed atomically upon calling Commit. +func (t *Transaction) Delete(key *Key) error { + err := t.DeleteMulti([]*Key{key}) + if me, ok := err.(MultiError); ok { + return me[0] + } + return err +} + +// DeleteMulti is a batch version of Delete. +// TODO(jba): rewrite in terms of Mutate. +func (t *Transaction) DeleteMulti(keys []*Key) (err error) { + if t.id == nil { + return errExpiredTransaction + } + mutations, err := deleteMutations(keys) + if err != nil { + return err + } + t.mutations = append(t.mutations, mutations...) + return nil +} + +// Mutate adds the mutations to the transaction. They will all be applied atomically +// upon calling Commit. Mutate returns a PendingKey for each Mutation in the argument +// list, in the same order. PendingKeys for Delete mutations are always nil. +// +// If any of the mutations are invalid, Mutate returns a MultiError with the errors. +// Mutate returns a MultiError in this case even if there is only one Mutation. +// +// For an example, see Client.Mutate. +func (t *Transaction) Mutate(muts ...*Mutation) ([]*PendingKey, error) { + if t.id == nil { + return nil, errExpiredTransaction + } + pmuts, err := mutationProtos(muts) + if err != nil { + return nil, err + } + origin := len(t.mutations) + t.mutations = append(t.mutations, pmuts...) + // Prepare the returned handles, pre-populating where possible. + ret := make([]*PendingKey, len(muts)) + for i, mut := range muts { + if mut.isDelete() { + continue + } + p := &PendingKey{} + if mut.key.Incomplete() { + // This key will be in the final commit result. + t.pending[origin+i] = p + } else { + p.key = mut.key + } + ret[i] = p + } + return ret, nil +} + +// Commit represents the result of a committed transaction. +type Commit struct{} + +// Key resolves a pending key handle into a final key. +func (c *Commit) Key(p *PendingKey) *Key { + if p == nil { // if called on a *PendingKey from a Delete mutation + return nil + } + // If p.commit is nil, the PendingKey did not come from an incomplete key, + // so p.key is valid. + if p.commit != nil && c != p.commit { + panic("PendingKey was not created by corresponding transaction") + } + return p.key +} + +// PendingKey represents the key for newly-inserted entity. It can be +// resolved into a Key by calling the Key method of Commit. +type PendingKey struct { + key *Key + commit *Commit +} diff --git a/vendor/cloud.google.com/go/doc.go b/vendor/cloud.google.com/go/doc.go new file mode 100644 index 000000000000..237d84561ce0 --- /dev/null +++ b/vendor/cloud.google.com/go/doc.go @@ -0,0 +1,100 @@ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/* +Package cloud is the root of the packages used to access Google Cloud +Services. See https://godoc.org/cloud.google.com/go for a full list +of sub-packages. + + +Client Options + +All clients in sub-packages are configurable via client options. These options are +described here: https://godoc.org/google.golang.org/api/option. + + +Authentication and Authorization + +All the clients in sub-packages support authentication via Google Application Default +Credentials (see https://cloud.google.com/docs/authentication/production), or +by providing a JSON key file for a Service Account. See the authentication examples +in this package for details. + + +Timeouts and Cancellation + +By default, all requests in sub-packages will run indefinitely, retrying on transient +errors when correctness allows. To set timeouts or arrange for cancellation, use +contexts. See the examples for details. + +Do not attempt to control the initial connection (dialing) of a service by setting a +timeout on the context passed to NewClient. Dialing is non-blocking, so timeouts +would be ineffective and would only interfere with credential refreshing, which uses +the same context. + + +Connection Pooling + +Connection pooling differs in clients based on their transport. Cloud +clients either rely on HTTP or gRPC transports to communicate +with Google Cloud. + +Cloud clients that use HTTP (bigquery, compute, storage, and translate) rely on the +underlying HTTP transport to cache connections for later re-use. These are cached to +the default http.MaxIdleConns and http.MaxIdleConnsPerHost settings in +http.DefaultTransport. + +For gRPC clients (all others in this repo), connection pooling is configurable. Users +of cloud client libraries may specify option.WithGRPCConnectionPool(n) as a client +option to NewClient calls. This configures the underlying gRPC connections to be +pooled and addressed in a round robin fashion. + + +Using the Libraries with Docker + +Minimal docker images like Alpine lack CA certificates. This causes RPCs to appear to +hang, because gRPC retries indefinitely. See https://github.com/googleapis/google-cloud-go/issues/928 +for more information. + + +Debugging + +To see gRPC logs, set the environment variable GRPC_GO_LOG_SEVERITY_LEVEL. See +https://godoc.org/google.golang.org/grpc/grpclog for more information. + +For HTTP logging, set the GODEBUG environment variable to "http2debug=1" or "http2debug=2". + + +Client Stability + +Clients in this repository are considered alpha or beta unless otherwise +marked as stable in the README.md. Semver is not used to communicate stability +of clients. + +Alpha and beta clients may change or go away without notice. + +Clients marked stable will maintain compatibility with future versions for as +long as we can reasonably sustain. Incompatible changes might be made in some +situations, including: + +- Security bugs may prompt backwards-incompatible changes. + +- Situations in which components are no longer feasible to maintain without +making breaking changes, including removal. + +- Parts of the client surface may be outright unstable and subject to change. +These parts of the surface will be labeled with the note, "It is EXPERIMENTAL +and subject to change or removal without notice." +*/ +package cloud // import "cloud.google.com/go" diff --git a/vendor/cloud.google.com/go/functions/metadata/.repo-metadata.json b/vendor/cloud.google.com/go/functions/metadata/.repo-metadata.json new file mode 100644 index 000000000000..f525bdc73028 --- /dev/null +++ b/vendor/cloud.google.com/go/functions/metadata/.repo-metadata.json @@ -0,0 +1,12 @@ +{ + "name": "metadata", + "name_pretty": "Cloud Functions", + "product_documentation": "http://cloud.google.com/functions", + "client_documentation": "https://godoc.org/cloud.google.com/go/functions/metadata", + "release_level": "alpha", + "language": "go", + "repo": "googleapis/google-cloud-go", + "distribution_name": "cloud.google.com/go/functions/metadata", + "api_id": "functions:metadata", + "requires_billing": true +} diff --git a/vendor/cloud.google.com/go/functions/metadata/metadata.go b/vendor/cloud.google.com/go/functions/metadata/metadata.go index a5dfd32557f9..1a08f392c4fa 100644 --- a/vendor/cloud.google.com/go/functions/metadata/metadata.go +++ b/vendor/cloud.google.com/go/functions/metadata/metadata.go @@ -43,6 +43,38 @@ type Resource struct { Name string `json:"name"` // Type is the type of event. Type string `json:"type"` + // Path is the path to the resource type (deprecated). + // This is the case for some deprecated GCS + // notifications, which populate the resource field as a string containing the topic + // rather than as the expected dictionary. + // See the Attributes section of https://cloud.google.com/storage/docs/pubsub-notifications + // for more details. + RawPath string `json:"-"` +} + +// UnmarshalJSON specializes the Resource unmarshalling to handle the case where the +// value is a string instead of a map. See the comment above on RawPath for why this +// needs to be handled. +func (r *Resource) UnmarshalJSON(data []byte) error { + // Try to unmarshal the resource into a string. + var path string + if err := json.Unmarshal(data, &path); err == nil { + r.RawPath = path + return nil + } + + // Otherwise, accept whatever the result of the normal unmarshal would be. + // Need to define a new type, otherwise it infinitely recurses and panics. + type resource Resource + var res resource + if err := json.Unmarshal(data, &res); err != nil { + return err + } + + r.Service = res.Service + r.Name = res.Name + r.Type = res.Type + return nil } type contextKey string diff --git a/vendor/cloud.google.com/go/go.mod b/vendor/cloud.google.com/go/go.mod new file mode 100644 index 000000000000..593298b5ff45 --- /dev/null +++ b/vendor/cloud.google.com/go/go.mod @@ -0,0 +1,32 @@ +module cloud.google.com/go + +go 1.11 + +require ( + cloud.google.com/go/bigquery v1.0.1 + cloud.google.com/go/datastore v1.0.0 + cloud.google.com/go/pubsub v1.0.1 + cloud.google.com/go/storage v1.0.0 + github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect + github.com/golang/mock v1.3.1 + github.com/golang/protobuf v1.3.2 + github.com/google/go-cmp v0.3.1 + github.com/google/martian v2.1.0+incompatible + github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc + github.com/googleapis/gax-go/v2 v2.0.5 + github.com/jstemmer/go-junit-report v0.9.1 + go.opencensus.io v0.22.2 + golang.org/x/exp v0.0.0-20191227195350-da58074b4299 + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f + golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 + golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect + golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 // indirect + golang.org/x/text v0.3.2 + golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 + google.golang.org/api v0.15.0 + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb + google.golang.org/grpc v1.26.0 + honnef.co/go/tools v0.0.1-2019.2.3 +) diff --git a/vendor/cloud.google.com/go/go.sum b/vendor/cloud.google.com/go/go.sum new file mode 100644 index 000000000000..2aebf8d5aa18 --- /dev/null +++ b/vendor/cloud.google.com/go/go.sum @@ -0,0 +1,257 @@ +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 h1:hL+ycaJpVE9M7nLoiXb/Pn10ENE2u+oddxbD8uu0ZVU= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/pubsub v1.0.1 h1:W9tAK3E57P75u0XLLR82LZyw8VpAnhmyTOxW9qzmyj8= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0 h1:VV2nUM3wwLLGh9lSABFgZMjInyUbJeaRSE64WuAIQ+4= +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 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/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 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s= +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 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57 h1:eqyIo2HjKhKe/mJzTG8n4VqvLXIOEG+SLdDqX7xGtkY= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc h1:DLpL8pWq0v4JYoRpEhDfsJhhJyGKCcQM2WPW2TJs31c= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +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/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA= +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 h1:OeRHuibLsmZkFj773W4LcfAGsSxJgfPONhr8cmO+eLA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979 h1:Agxu5KLo8o7Bb634SVDnhIfpTvxmzUwhbYAzBvXt6h4= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299 h1:zQpM52jfKHG6II1ISZY1ZcpygvuSFZpLwfluuF89XOg= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +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 h1:hX65Cu3JDlGH3uEdK7I99Ii+9kjD6mvnnpfLdEAH0x4= +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 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac h1:8R1esu+8QioDxo4E4mX6bFztO+dMTM49DNAaWfO5OeY= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +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.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +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-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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +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 h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw= +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 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 h1:pE8b58s1HRDMi8RDc79m0HISf9D4TzseP40cEA6IGfs= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/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 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +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 h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA= +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 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 h1:JA8d3MPx/IToSyXZG/RhwYEtfrKO1Fxrqe8KrkiLXKM= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +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 h1:H3uGjxCR/6Ds0Mjgyp7LMK81+LvmbvWWEnJhzk1Pi9E= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/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 h1:97SnQk1GYRXJgvwZ8fadnxDOWfKvkNQHH3CtZntPSrM= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/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 h1:Dh6fw+p6FyRl5x/FvNswO1ji0lIGzm3KP8Y9VkS9PTE= +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 h1:On1qIo75ByTwFJ4/W2bIqHcwJ9XAqtSWUs8GwRrIhtc= +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-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 h1:Toz2IK7k8rbltAXwNAxKcn9OzqyNfMUhUNjz3sL0NMk= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +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= +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 h1:VGGbLNyPF7dvYHhcUGYBBGCRDDK0RRJAI6KCvo0CL+E= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.15.0 h1:yzlyyDW/J0w8yNFJIhiAJy4kq74S+1DOLdawELNxFMA= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= +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 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 h1:iKtrH9Y8mcbADOP0YFaEMth7OfuHY9xHOwNj4znpM1A= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 h1:Ex1mq5jaJof+kRnYi3SlYJ8KKa9Ao3NHyIT5XJ1gF6U= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb h1:ADPHZzpzM4tk4V4S5cnCrr5SwzvlrPRmqqCuJDB8UTs= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +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/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a h1:/8zB6iBfHCl1qAnEAWwGPNrUvapuy6CPla1VM0k8hQw= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a h1:LJwr7TCTghdatWv40WobzlKXc9c4s8oGa7QKJUtHhWA= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/cloud.google.com/go/iam/.repo-metadata.json b/vendor/cloud.google.com/go/iam/.repo-metadata.json new file mode 100644 index 000000000000..0edb2d8b454c --- /dev/null +++ b/vendor/cloud.google.com/go/iam/.repo-metadata.json @@ -0,0 +1,12 @@ +{ + "name": "iam", + "name_pretty": "Cloud Identify and Access Management API", + "product_documentation": "https://cloud.google.com/iam", + "client_documentation": "https://godoc.org/cloud.google.com/go/iam", + "release_level": "ga", + "language": "go", + "repo": "googleapis/google-cloud-go", + "distribution_name": "cloud.google.com/go/iam", + "api_id": "iam.googleapis.com", + "requires_billing": true +} diff --git a/vendor/cloud.google.com/go/internal/fields/fields.go b/vendor/cloud.google.com/go/internal/fields/fields.go new file mode 100644 index 000000000000..6d7cabb1811f --- /dev/null +++ b/vendor/cloud.google.com/go/internal/fields/fields.go @@ -0,0 +1,480 @@ +// Copyright 2016 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package fields provides a view of the fields of a struct that follows the Go +// rules, amended to consider tags and case insensitivity. +// +// Usage +// +// First define a function that interprets tags: +// +// func parseTag(st reflect.StructTag) (name string, keep bool, other interface{}, err error) { ... } +// +// The function's return values describe whether to ignore the field +// completely or provide an alternate name, as well as other data from the +// parse that is stored to avoid re-parsing. +// +// Then define a function to validate the type: +// +// func validate(t reflect.Type) error { ... } +// +// Then, if necessary, define a function to specify leaf types - types +// which should be considered one field and not be recursed into: +// +// func isLeafType(t reflect.Type) bool { ... } +// +// eg: +// +// func isLeafType(t reflect.Type) bool { +// return t == reflect.TypeOf(time.Time{}) +// } +// +// Next, construct a Cache, passing your functions. As its name suggests, a +// Cache remembers validation and field information for a type, so subsequent +// calls with the same type are very fast. +// +// cache := fields.NewCache(parseTag, validate, isLeafType) +// +// To get the fields of a struct type as determined by the above rules, call +// the Fields method: +// +// fields, err := cache.Fields(reflect.TypeOf(MyStruct{})) +// +// The return value can be treated as a slice of Fields. +// +// Given a string, such as a key or column name obtained during unmarshalling, +// call Match on the list of fields to find a field whose name is the best +// match: +// +// field := fields.Match(name) +// +// Match looks for an exact match first, then falls back to a case-insensitive +// comparison. +package fields + +import ( + "bytes" + "errors" + "reflect" + "sort" + "strings" + "sync" +) + +// A Field records information about a struct field. +type Field struct { + Name string // effective field name + NameFromTag bool // did Name come from a tag? + Type reflect.Type // field type + Index []int // index sequence, for reflect.Value.FieldByIndex + ParsedTag interface{} // third return value of the parseTag function + + nameBytes []byte + equalFold func(s, t []byte) bool +} + +// ParseTagFunc is a function that accepts a struct tag and returns four values: an alternative name for the field +// extracted from the tag, a boolean saying whether to keep the field or ignore it, additional data that is stored +// with the field information to avoid having to parse the tag again, and an error. +type ParseTagFunc func(reflect.StructTag) (name string, keep bool, other interface{}, err error) + +// ValidateFunc is a function that accepts a reflect.Type and returns an error if the struct type is invalid in any +// way. +type ValidateFunc func(reflect.Type) error + +// LeafTypesFunc is a function that accepts a reflect.Type and returns true if the struct type a leaf, or false if not. +// TODO(deklerk): is this description accurate? +type LeafTypesFunc func(reflect.Type) bool + +// A Cache records information about the fields of struct types. +// +// A Cache is safe for use by multiple goroutines. +type Cache struct { + parseTag ParseTagFunc + validate ValidateFunc + leafTypes LeafTypesFunc + cache sync.Map // from reflect.Type to cacheValue +} + +// NewCache constructs a Cache. +// +// Its first argument should be a function that accepts +// a struct tag and returns four values: an alternative name for the field +// extracted from the tag, a boolean saying whether to keep the field or ignore +// it, additional data that is stored with the field information to avoid +// having to parse the tag again, and an error. +// +// Its second argument should be a function that accepts a reflect.Type and +// returns an error if the struct type is invalid in any way. For example, it +// may check that all of the struct field tags are valid, or that all fields +// are of an appropriate type. +func NewCache(parseTag ParseTagFunc, validate ValidateFunc, leafTypes LeafTypesFunc) *Cache { + if parseTag == nil { + parseTag = func(reflect.StructTag) (string, bool, interface{}, error) { + return "", true, nil, nil + } + } + if validate == nil { + validate = func(reflect.Type) error { + return nil + } + } + if leafTypes == nil { + leafTypes = func(reflect.Type) bool { + return false + } + } + + return &Cache{ + parseTag: parseTag, + validate: validate, + leafTypes: leafTypes, + } +} + +// A fieldScan represents an item on the fieldByNameFunc scan work list. +type fieldScan struct { + typ reflect.Type + index []int +} + +// Fields returns all the exported fields of t, which must be a struct type. It +// follows the standard Go rules for embedded fields, modified by the presence +// of tags. The result is sorted lexicographically by index. +// +// These rules apply in the absence of tags: +// Anonymous struct fields are treated as if their inner exported fields were +// fields in the outer struct (embedding). The result includes all fields that +// aren't shadowed by fields at higher level of embedding. If more than one +// field with the same name exists at the same level of embedding, it is +// excluded. An anonymous field that is not of struct type is treated as having +// its type as its name. +// +// Tags modify these rules as follows: +// A field's tag is used as its name. +// An anonymous struct field with a name given in its tag is treated as +// a field having that name, rather than an embedded struct (the struct's +// fields will not be returned). +// If more than one field with the same name exists at the same level of embedding, +// but exactly one of them is tagged, then the tagged field is reported and the others +// are ignored. +func (c *Cache) Fields(t reflect.Type) (List, error) { + if t.Kind() != reflect.Struct { + panic("fields: Fields of non-struct type") + } + return c.cachedTypeFields(t) +} + +// A List is a list of Fields. +type List []Field + +// Match returns the field in the list whose name best matches the supplied +// name, nor nil if no field does. If there is a field with the exact name, it +// is returned. Otherwise the first field (sorted by index) whose name matches +// case-insensitively is returned. +func (l List) Match(name string) *Field { + return l.MatchBytes([]byte(name)) +} + +// MatchBytes is identical to Match, except that the argument is a byte slice. +func (l List) MatchBytes(name []byte) *Field { + var f *Field + for i := range l { + ff := &l[i] + if bytes.Equal(ff.nameBytes, name) { + return ff + } + if f == nil && ff.equalFold(ff.nameBytes, name) { + f = ff + } + } + return f +} + +type cacheValue struct { + fields List + err error +} + +// cachedTypeFields is like typeFields but uses a cache to avoid repeated work. +// This code has been copied and modified from +// https://go.googlesource.com/go/+/go1.7.3/src/encoding/json/encode.go. +func (c *Cache) cachedTypeFields(t reflect.Type) (List, error) { + var cv cacheValue + x, ok := c.cache.Load(t) + if ok { + cv = x.(cacheValue) + } else { + if err := c.validate(t); err != nil { + cv = cacheValue{nil, err} + } else { + f, err := c.typeFields(t) + cv = cacheValue{List(f), err} + } + c.cache.Store(t, cv) + } + return cv.fields, cv.err +} + +func (c *Cache) typeFields(t reflect.Type) ([]Field, error) { + fields, err := c.listFields(t) + if err != nil { + return nil, err + } + sort.Sort(byName(fields)) + // Delete all fields that are hidden by the Go rules for embedded fields. + + // The fields are sorted in primary order of name, secondary order of field + // index length. So the first field with a given name is the dominant one. + var out []Field + for advance, i := 0, 0; i < len(fields); i += advance { + // One iteration per name. + // Find the sequence of fields with the name of this first field. + fi := fields[i] + name := fi.Name + for advance = 1; i+advance < len(fields); advance++ { + fj := fields[i+advance] + if fj.Name != name { + break + } + } + // Find the dominant field, if any, out of all fields that have the same name. + dominant, ok := dominantField(fields[i : i+advance]) + if ok { + out = append(out, dominant) + } + } + sort.Sort(byIndex(out)) + return out, nil +} + +func (c *Cache) listFields(t reflect.Type) ([]Field, error) { + // This uses the same condition that the Go language does: there must be a unique instance + // of the match at a given depth level. If there are multiple instances of a match at the + // same depth, they annihilate each other and inhibit any possible match at a lower level. + // The algorithm is breadth first search, one depth level at a time. + + // The current and next slices are work queues: + // current lists the fields to visit on this depth level, + // and next lists the fields on the next lower level. + current := []fieldScan{} + next := []fieldScan{{typ: t}} + + // nextCount records the number of times an embedded type has been + // encountered and considered for queueing in the 'next' slice. + // We only queue the first one, but we increment the count on each. + // If a struct type T can be reached more than once at a given depth level, + // then it annihilates itself and need not be considered at all when we + // process that next depth level. + var nextCount map[reflect.Type]int + + // visited records the structs that have been considered already. + // Embedded pointer fields can create cycles in the graph of + // reachable embedded types; visited avoids following those cycles. + // It also avoids duplicated effort: if we didn't find the field in an + // embedded type T at level 2, we won't find it in one at level 4 either. + visited := map[reflect.Type]bool{} + + var fields []Field // Fields found. + + for len(next) > 0 { + current, next = next, current[:0] + count := nextCount + nextCount = nil + + // Process all the fields at this depth, now listed in 'current'. + // The loop queues embedded fields found in 'next', for processing during the next + // iteration. The multiplicity of the 'current' field counts is recorded + // in 'count'; the multiplicity of the 'next' field counts is recorded in 'nextCount'. + for _, scan := range current { + t := scan.typ + if visited[t] { + // We've looked through this type before, at a higher level. + // That higher level would shadow the lower level we're now at, + // so this one can't be useful to us. Ignore it. + continue + } + visited[t] = true + for i := 0; i < t.NumField(); i++ { + f := t.Field(i) + + exported := (f.PkgPath == "") + + // If a named field is unexported, ignore it. An anonymous + // unexported field is processed, because it may contain + // exported fields, which are visible. + if !exported && !f.Anonymous { + continue + } + + // Examine the tag. + tagName, keep, other, err := c.parseTag(f.Tag) + if err != nil { + return nil, err + } + if !keep { + continue + } + if c.leafTypes(f.Type) { + fields = append(fields, newField(f, tagName, other, scan.index, i)) + continue + } + + var ntyp reflect.Type + if f.Anonymous { + // Anonymous field of type T or *T. + ntyp = f.Type + if ntyp.Kind() == reflect.Ptr { + ntyp = ntyp.Elem() + } + } + + // Record fields with a tag name, non-anonymous fields, or + // anonymous non-struct fields. + if tagName != "" || ntyp == nil || ntyp.Kind() != reflect.Struct { + if !exported { + continue + } + fields = append(fields, newField(f, tagName, other, scan.index, i)) + if count[t] > 1 { + // If there were multiple instances, add a second, + // so that the annihilation code will see a duplicate. + fields = append(fields, fields[len(fields)-1]) + } + continue + } + + // Queue embedded struct fields for processing with next level, + // but only if the embedded types haven't already been queued. + if nextCount[ntyp] > 0 { + nextCount[ntyp] = 2 // exact multiple doesn't matter + continue + } + if nextCount == nil { + nextCount = map[reflect.Type]int{} + } + nextCount[ntyp] = 1 + if count[t] > 1 { + nextCount[ntyp] = 2 // exact multiple doesn't matter + } + var index []int + index = append(index, scan.index...) + index = append(index, i) + next = append(next, fieldScan{ntyp, index}) + } + } + } + return fields, nil +} + +func newField(f reflect.StructField, tagName string, other interface{}, index []int, i int) Field { + name := tagName + if name == "" { + name = f.Name + } + sf := Field{ + Name: name, + NameFromTag: tagName != "", + Type: f.Type, + ParsedTag: other, + nameBytes: []byte(name), + } + sf.equalFold = foldFunc(sf.nameBytes) + sf.Index = append(sf.Index, index...) + sf.Index = append(sf.Index, i) + return sf +} + +// byName sorts fields using the following criteria, in order: +// 1. name +// 2. embedding depth +// 3. tag presence (preferring a tagged field) +// 4. index sequence. +type byName []Field + +func (x byName) Len() int { return len(x) } + +func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] } + +func (x byName) Less(i, j int) bool { + if x[i].Name != x[j].Name { + return x[i].Name < x[j].Name + } + if len(x[i].Index) != len(x[j].Index) { + return len(x[i].Index) < len(x[j].Index) + } + if x[i].NameFromTag != x[j].NameFromTag { + return x[i].NameFromTag + } + return byIndex(x).Less(i, j) +} + +// byIndex sorts field by index sequence. +type byIndex []Field + +func (x byIndex) Len() int { return len(x) } + +func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] } + +func (x byIndex) Less(i, j int) bool { + xi := x[i].Index + xj := x[j].Index + ln := len(xi) + if l := len(xj); l < ln { + ln = l + } + for k := 0; k < ln; k++ { + if xi[k] != xj[k] { + return xi[k] < xj[k] + } + } + return len(xi) < len(xj) +} + +// dominantField looks through the fields, all of which are known to have the +// same name, to find the single field that dominates the others using Go's +// embedding rules, modified by the presence of tags. If there are multiple +// top-level fields, the boolean will be false: This condition is an error in +// Go and we skip all the fields. +func dominantField(fs []Field) (Field, bool) { + // The fields are sorted in increasing index-length order, then by presence of tag. + // That means that the first field is the dominant one. We need only check + // for error cases: two fields at top level, either both tagged or neither tagged. + if len(fs) > 1 && len(fs[0].Index) == len(fs[1].Index) && fs[0].NameFromTag == fs[1].NameFromTag { + return Field{}, false + } + return fs[0], true +} + +// ParseStandardTag extracts the sub-tag named by key, then parses it using the +// de facto standard format introduced in encoding/json: +// "-" means "ignore this tag". It must occur by itself. (parseStandardTag returns an error +// in this case, whereas encoding/json accepts the "-" even if it is not alone.) +// "" provides an alternative name for the field +// ",opt1,opt2,..." specifies options after the name. +// The options are returned as a []string. +func ParseStandardTag(key string, t reflect.StructTag) (name string, keep bool, options []string, err error) { + s := t.Get(key) + parts := strings.Split(s, ",") + if parts[0] == "-" { + if len(parts) > 1 { + return "", false, nil, errors.New(`"-" field tag with options`) + } + return "", false, nil, nil + } + if len(parts) > 1 { + options = parts[1:] + } + return parts[0], true, options, nil +} diff --git a/vendor/cloud.google.com/go/internal/fields/fold.go b/vendor/cloud.google.com/go/internal/fields/fold.go new file mode 100644 index 000000000000..68e2588c4257 --- /dev/null +++ b/vendor/cloud.google.com/go/internal/fields/fold.go @@ -0,0 +1,156 @@ +// Copyright 2016 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package fields + +// This file was copied from https://go.googlesource.com/go/+/go1.7.3/src/encoding/json/fold.go. +// Only the license and package were changed. + +import ( + "bytes" + "unicode/utf8" +) + +const ( + caseMask = ^byte(0x20) // Mask to ignore case in ASCII. + kelvin = '\u212a' + smallLongEss = '\u017f' +) + +// foldFunc returns one of four different case folding equivalence +// functions, from most general (and slow) to fastest: +// +// 1) bytes.EqualFold, if the key s contains any non-ASCII UTF-8 +// 2) equalFoldRight, if s contains special folding ASCII ('k', 'K', 's', 'S') +// 3) asciiEqualFold, no special, but includes non-letters (including _) +// 4) simpleLetterEqualFold, no specials, no non-letters. +// +// The letters S and K are special because they map to 3 runes, not just 2: +// * S maps to s and to U+017F 'ſ' Latin small letter long s +// * k maps to K and to U+212A 'K' Kelvin sign +// See https://play.golang.org/p/tTxjOc0OGo +// +// The returned function is specialized for matching against s and +// should only be given s. It's not curried for performance reasons. +func foldFunc(s []byte) func(s, t []byte) bool { + nonLetter := false + special := false // special letter + for _, b := range s { + if b >= utf8.RuneSelf { + return bytes.EqualFold + } + upper := b & caseMask + if upper < 'A' || upper > 'Z' { + nonLetter = true + } else if upper == 'K' || upper == 'S' { + // See above for why these letters are special. + special = true + } + } + if special { + return equalFoldRight + } + if nonLetter { + return asciiEqualFold + } + return simpleLetterEqualFold +} + +// equalFoldRight is a specialization of bytes.EqualFold when s is +// known to be all ASCII (including punctuation), but contains an 's', +// 'S', 'k', or 'K', requiring a Unicode fold on the bytes in t. +// See comments on foldFunc. +func equalFoldRight(s, t []byte) bool { + for _, sb := range s { + if len(t) == 0 { + return false + } + tb := t[0] + if tb < utf8.RuneSelf { + if sb != tb { + sbUpper := sb & caseMask + if 'A' <= sbUpper && sbUpper <= 'Z' { + if sbUpper != tb&caseMask { + return false + } + } else { + return false + } + } + t = t[1:] + continue + } + // sb is ASCII and t is not. t must be either kelvin + // sign or long s; sb must be s, S, k, or K. + tr, size := utf8.DecodeRune(t) + switch sb { + case 's', 'S': + if tr != smallLongEss { + return false + } + case 'k', 'K': + if tr != kelvin { + return false + } + default: + return false + } + t = t[size:] + + } + if len(t) > 0 { + return false + } + return true +} + +// asciiEqualFold is a specialization of bytes.EqualFold for use when +// s is all ASCII (but may contain non-letters) and contains no +// special-folding letters. +// See comments on foldFunc. +func asciiEqualFold(s, t []byte) bool { + if len(s) != len(t) { + return false + } + for i, sb := range s { + tb := t[i] + if sb == tb { + continue + } + if ('a' <= sb && sb <= 'z') || ('A' <= sb && sb <= 'Z') { + if sb&caseMask != tb&caseMask { + return false + } + } else { + return false + } + } + return true +} + +// simpleLetterEqualFold is a specialization of bytes.EqualFold for +// use when s is all ASCII letters (no underscores, etc) and also +// doesn't contain 'k', 'K', 's', or 'S'. +// See comments on foldFunc. +func simpleLetterEqualFold(s, t []byte) bool { + if len(s) != len(t) { + return false + } + for i, b := range s { + if b&caseMask != t[i]&caseMask { + return false + } + } + return true +} diff --git a/vendor/cloud.google.com/go/internal/version/update_version.sh b/vendor/cloud.google.com/go/internal/version/update_version.sh old mode 100755 new mode 100644 index fecf1f03fdeb..d7c5a3e219c9 --- a/vendor/cloud.google.com/go/internal/version/update_version.sh +++ b/vendor/cloud.google.com/go/internal/version/update_version.sh @@ -1,4 +1,17 @@ #!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. today=$(date +%Y%m%d) diff --git a/vendor/cloud.google.com/go/internal/version/version.go b/vendor/cloud.google.com/go/internal/version/version.go index 4a2a8c19ff19..f817afb7301b 100644 --- a/vendor/cloud.google.com/go/internal/version/version.go +++ b/vendor/cloud.google.com/go/internal/version/version.go @@ -26,7 +26,7 @@ import ( // Repo is the current version of the client libraries in this // repo. It should be a date in YYYYMMDD format. -const Repo = "20180226" +const Repo = "20191119" // Go returns the Go runtime version. The returned string // has no whitespace. diff --git a/vendor/cloud.google.com/go/issue_template.md b/vendor/cloud.google.com/go/issue_template.md new file mode 100644 index 000000000000..e2ccef3e78df --- /dev/null +++ b/vendor/cloud.google.com/go/issue_template.md @@ -0,0 +1,17 @@ +(delete this for feature requests) + +## Client + +e.g. PubSub + +## Describe Your Environment + +e.g. Alpine Docker on GKE + +## Expected Behavior + +e.g. Messages arrive really fast. + +## Actual Behavior + +e.g. Messages arrive really slowly. \ No newline at end of file diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/.repo-metadata.json b/vendor/cloud.google.com/go/monitoring/apiv3/.repo-metadata.json new file mode 100644 index 000000000000..ec9a49c44fdc --- /dev/null +++ b/vendor/cloud.google.com/go/monitoring/apiv3/.repo-metadata.json @@ -0,0 +1,12 @@ +{ + "name": "monitoring", + "name_pretty": "Stackdriver Monitoring API", + "product_documentation": "https://cloud.google.com/monitoring", + "client_documentation": "https://godoc.org/cloud.google.com/go/monitoring/apiv3", + "release_level": "alpha", + "language": "go", + "repo": "googleapis/google-cloud-go", + "distribution_name": "cloud.google.com/go", + "api_id": "monitoring.googleapis.com", + "requires_billing": true +} diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/doc.go b/vendor/cloud.google.com/go/monitoring/apiv3/doc.go index e6ecf8f7e55d..45c925ebad5e 100644 --- a/vendor/cloud.google.com/go/monitoring/apiv3/doc.go +++ b/vendor/cloud.google.com/go/monitoring/apiv3/doc.go @@ -105,4 +105,4 @@ func versionGo() string { return "UNKNOWN" } -const versionClient = "20191115" +const versionClient = "20191229" diff --git a/vendor/cloud.google.com/go/pubsub/CHANGES.md b/vendor/cloud.google.com/go/pubsub/CHANGES.md new file mode 100644 index 000000000000..1b45c6572a51 --- /dev/null +++ b/vendor/cloud.google.com/go/pubsub/CHANGES.md @@ -0,0 +1,6 @@ +# Changes + +## v1.0.0 + +This is the first tag to carve out pubsub as its own module. See: +https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. \ No newline at end of file diff --git a/vendor/github.com/coreos/etcd/LICENSE b/vendor/cloud.google.com/go/pubsub/LICENSE similarity index 100% rename from vendor/github.com/coreos/etcd/LICENSE rename to vendor/cloud.google.com/go/pubsub/LICENSE diff --git a/vendor/cloud.google.com/go/pubsub/README.md b/vendor/cloud.google.com/go/pubsub/README.md new file mode 100644 index 000000000000..59f4cf66d9d2 --- /dev/null +++ b/vendor/cloud.google.com/go/pubsub/README.md @@ -0,0 +1,46 @@ +## Cloud Pub/Sub [![GoDoc](https://godoc.org/cloud.google.com/go/pubsub?status.svg)](https://godoc.org/cloud.google.com/go/pubsub) + +- [About Cloud Pubsub](https://cloud.google.com/pubsub/) +- [API documentation](https://cloud.google.com/pubsub/docs) +- [Go client documentation](https://godoc.org/cloud.google.com/go/pubsub) +- [Complete sample programs](https://github.com/GoogleCloudPlatform/golang-samples/tree/master/pubsub) + +### Example Usage + +First create a `pubsub.Client` to use throughout your application: + +[snip]:# (pubsub-1) +```go +client, err := pubsub.NewClient(ctx, "project-id") +if err != nil { + log.Fatal(err) +} +``` + +Then use the client to publish and subscribe: + +[snip]:# (pubsub-2) +```go +// Publish "hello world" on topic1. +topic := client.Topic("topic1") +res := topic.Publish(ctx, &pubsub.Message{ + Data: []byte("hello world"), +}) +// The publish happens asynchronously. +// Later, you can get the result from res: +... +msgID, err := res.Get(ctx) +if err != nil { + log.Fatal(err) +} + +// Use a callback to receive messages via subscription1. +sub := client.Subscription("subscription1") +err = sub.Receive(ctx, func(ctx context.Context, m *pubsub.Message) { + fmt.Println(m.Data) + m.Ack() // Acknowledge that we've consumed the message. +}) +if err != nil { + log.Println(err) +} +``` \ No newline at end of file diff --git a/vendor/cloud.google.com/go/pubsub/apiv1/doc.go b/vendor/cloud.google.com/go/pubsub/apiv1/doc.go index 20562a54121b..e897795649df 100644 --- a/vendor/cloud.google.com/go/pubsub/apiv1/doc.go +++ b/vendor/cloud.google.com/go/pubsub/apiv1/doc.go @@ -100,4 +100,4 @@ func versionGo() string { return "UNKNOWN" } -const versionClient = "20190528" +const versionClient = "20190819" diff --git a/vendor/cloud.google.com/go/pubsub/apiv1/publisher_client.go b/vendor/cloud.google.com/go/pubsub/apiv1/publisher_client.go index 1f605146eb1e..b99214db0f3d 100644 --- a/vendor/cloud.google.com/go/pubsub/apiv1/publisher_client.go +++ b/vendor/cloud.google.com/go/pubsub/apiv1/publisher_client.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "math" + "net/url" "time" "github.com/golang/protobuf/proto" @@ -48,6 +49,8 @@ func defaultPublisherClientOptions() []option.ClientOption { return []option.ClientOption{ option.WithEndpoint("pubsub.googleapis.com:443"), option.WithScopes(DefaultAuthScopes()...), + option.WithGRPCDialOption(grpc.WithDefaultCallOptions( + grpc.MaxCallRecvMsgSize(math.MaxInt32))), } } @@ -166,7 +169,7 @@ func (c *PublisherClient) SetGoogleClientInfo(keyval ...string) { // // resource name rules. func (c *PublisherClient) CreateTopic(ctx context.Context, req *pubsubpb.Topic, opts ...gax.CallOption) (*pubsubpb.Topic, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", req.GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.CreateTopic[0:len(c.CallOptions.CreateTopic):len(c.CallOptions.CreateTopic)], opts...) var resp *pubsubpb.Topic @@ -184,7 +187,7 @@ func (c *PublisherClient) CreateTopic(ctx context.Context, req *pubsubpb.Topic, // UpdateTopic updates an existing topic. Note that certain properties of a // topic are not modifiable. func (c *PublisherClient) UpdateTopic(ctx context.Context, req *pubsubpb.UpdateTopicRequest, opts ...gax.CallOption) (*pubsubpb.Topic, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic.name", req.GetTopic().GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic.name", url.QueryEscape(req.GetTopic().GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.UpdateTopic[0:len(c.CallOptions.UpdateTopic):len(c.CallOptions.UpdateTopic)], opts...) var resp *pubsubpb.Topic @@ -202,7 +205,7 @@ func (c *PublisherClient) UpdateTopic(ctx context.Context, req *pubsubpb.UpdateT // Publish adds one or more messages to the topic. Returns NOT_FOUND if the topic // does not exist. func (c *PublisherClient) Publish(ctx context.Context, req *pubsubpb.PublishRequest, opts ...gax.CallOption) (*pubsubpb.PublishResponse, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", req.GetTopic())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", url.QueryEscape(req.GetTopic()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.Publish[0:len(c.CallOptions.Publish):len(c.CallOptions.Publish)], opts...) var resp *pubsubpb.PublishResponse @@ -219,7 +222,7 @@ func (c *PublisherClient) Publish(ctx context.Context, req *pubsubpb.PublishRequ // GetTopic gets the configuration of a topic. func (c *PublisherClient) GetTopic(ctx context.Context, req *pubsubpb.GetTopicRequest, opts ...gax.CallOption) (*pubsubpb.Topic, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", req.GetTopic())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", url.QueryEscape(req.GetTopic()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.GetTopic[0:len(c.CallOptions.GetTopic):len(c.CallOptions.GetTopic)], opts...) var resp *pubsubpb.Topic @@ -236,7 +239,7 @@ func (c *PublisherClient) GetTopic(ctx context.Context, req *pubsubpb.GetTopicRe // ListTopics lists matching topics. func (c *PublisherClient) ListTopics(ctx context.Context, req *pubsubpb.ListTopicsRequest, opts ...gax.CallOption) *TopicIterator { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", req.GetProject())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ListTopics[0:len(c.CallOptions.ListTopics):len(c.CallOptions.ListTopics)], opts...) it := &TopicIterator{} @@ -275,7 +278,7 @@ func (c *PublisherClient) ListTopics(ctx context.Context, req *pubsubpb.ListTopi // ListTopicSubscriptions lists the names of the subscriptions on this topic. func (c *PublisherClient) ListTopicSubscriptions(ctx context.Context, req *pubsubpb.ListTopicSubscriptionsRequest, opts ...gax.CallOption) *StringIterator { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", req.GetTopic())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", url.QueryEscape(req.GetTopic()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ListTopicSubscriptions[0:len(c.CallOptions.ListTopicSubscriptions):len(c.CallOptions.ListTopicSubscriptions)], opts...) it := &StringIterator{} @@ -318,7 +321,7 @@ func (c *PublisherClient) ListTopicSubscriptions(ctx context.Context, req *pubsu // configuration or subscriptions. Existing subscriptions to this topic are // not deleted, but their topic field is set to _deleted-topic_. func (c *PublisherClient) DeleteTopic(ctx context.Context, req *pubsubpb.DeleteTopicRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", req.GetTopic())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "topic", url.QueryEscape(req.GetTopic()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.DeleteTopic[0:len(c.CallOptions.DeleteTopic):len(c.CallOptions.DeleteTopic)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { diff --git a/vendor/cloud.google.com/go/pubsub/apiv1/subscriber_client.go b/vendor/cloud.google.com/go/pubsub/apiv1/subscriber_client.go index 7cd8447a91e0..260615b07922 100644 --- a/vendor/cloud.google.com/go/pubsub/apiv1/subscriber_client.go +++ b/vendor/cloud.google.com/go/pubsub/apiv1/subscriber_client.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "math" + "net/url" "time" "github.com/golang/protobuf/proto" @@ -56,6 +57,8 @@ func defaultSubscriberClientOptions() []option.ClientOption { return []option.ClientOption{ option.WithEndpoint("pubsub.googleapis.com:443"), option.WithScopes(DefaultAuthScopes()...), + option.WithGRPCDialOption(grpc.WithDefaultCallOptions( + grpc.MaxCallRecvMsgSize(math.MaxInt32))), } } @@ -200,7 +203,7 @@ func (c *SubscriberClient) SetGoogleClientInfo(keyval ...string) { // generated name is populated in the returned Subscription object. Note that // for REST API requests, you must specify a name in the request. func (c *SubscriberClient) CreateSubscription(ctx context.Context, req *pubsubpb.Subscription, opts ...gax.CallOption) (*pubsubpb.Subscription, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", req.GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.CreateSubscription[0:len(c.CallOptions.CreateSubscription):len(c.CallOptions.CreateSubscription)], opts...) var resp *pubsubpb.Subscription @@ -217,7 +220,7 @@ func (c *SubscriberClient) CreateSubscription(ctx context.Context, req *pubsubpb // GetSubscription gets the configuration details of a subscription. func (c *SubscriberClient) GetSubscription(ctx context.Context, req *pubsubpb.GetSubscriptionRequest, opts ...gax.CallOption) (*pubsubpb.Subscription, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.GetSubscription[0:len(c.CallOptions.GetSubscription):len(c.CallOptions.GetSubscription)], opts...) var resp *pubsubpb.Subscription @@ -235,7 +238,7 @@ func (c *SubscriberClient) GetSubscription(ctx context.Context, req *pubsubpb.Ge // UpdateSubscription updates an existing subscription. Note that certain properties of a // subscription, such as its topic, are not modifiable. func (c *SubscriberClient) UpdateSubscription(ctx context.Context, req *pubsubpb.UpdateSubscriptionRequest, opts ...gax.CallOption) (*pubsubpb.Subscription, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription.name", req.GetSubscription().GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription.name", url.QueryEscape(req.GetSubscription().GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.UpdateSubscription[0:len(c.CallOptions.UpdateSubscription):len(c.CallOptions.UpdateSubscription)], opts...) var resp *pubsubpb.Subscription @@ -252,7 +255,7 @@ func (c *SubscriberClient) UpdateSubscription(ctx context.Context, req *pubsubpb // ListSubscriptions lists matching subscriptions. func (c *SubscriberClient) ListSubscriptions(ctx context.Context, req *pubsubpb.ListSubscriptionsRequest, opts ...gax.CallOption) *SubscriptionIterator { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", req.GetProject())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ListSubscriptions[0:len(c.CallOptions.ListSubscriptions):len(c.CallOptions.ListSubscriptions)], opts...) it := &SubscriptionIterator{} @@ -295,7 +298,7 @@ func (c *SubscriberClient) ListSubscriptions(ctx context.Context, req *pubsubpb. // the same name, but the new one has no association with the old // subscription or its topic unless the same topic is specified. func (c *SubscriberClient) DeleteSubscription(ctx context.Context, req *pubsubpb.DeleteSubscriptionRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.DeleteSubscription[0:len(c.CallOptions.DeleteSubscription):len(c.CallOptions.DeleteSubscription)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { @@ -312,7 +315,7 @@ func (c *SubscriberClient) DeleteSubscription(ctx context.Context, req *pubsubpb // processing was interrupted. Note that this does not modify the // subscription-level ackDeadlineSeconds used for subsequent messages. func (c *SubscriberClient) ModifyAckDeadline(ctx context.Context, req *pubsubpb.ModifyAckDeadlineRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ModifyAckDeadline[0:len(c.CallOptions.ModifyAckDeadline):len(c.CallOptions.ModifyAckDeadline)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { @@ -331,7 +334,7 @@ func (c *SubscriberClient) ModifyAckDeadline(ctx context.Context, req *pubsubpb. // but such a message may be redelivered later. Acknowledging a message more // than once will not result in an error. func (c *SubscriberClient) Acknowledge(ctx context.Context, req *pubsubpb.AcknowledgeRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.Acknowledge[0:len(c.CallOptions.Acknowledge):len(c.CallOptions.Acknowledge)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { @@ -346,7 +349,7 @@ func (c *SubscriberClient) Acknowledge(ctx context.Context, req *pubsubpb.Acknow // there are too many concurrent pull requests pending for the given // subscription. func (c *SubscriberClient) Pull(ctx context.Context, req *pubsubpb.PullRequest, opts ...gax.CallOption) (*pubsubpb.PullResponse, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.Pull[0:len(c.CallOptions.Pull):len(c.CallOptions.Pull)], opts...) var resp *pubsubpb.PullResponse @@ -390,7 +393,7 @@ func (c *SubscriberClient) StreamingPull(ctx context.Context, opts ...gax.CallOp // attributes of a push subscription. Messages will accumulate for delivery // continuously through the call regardless of changes to the PushConfig. func (c *SubscriberClient) ModifyPushConfig(ctx context.Context, req *pubsubpb.ModifyPushConfigRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ModifyPushConfig[0:len(c.CallOptions.ModifyPushConfig):len(c.CallOptions.ModifyPushConfig)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { @@ -408,7 +411,7 @@ func (c *SubscriberClient) ModifyPushConfig(ctx context.Context, req *pubsubpb.M // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. func (c *SubscriberClient) ListSnapshots(ctx context.Context, req *pubsubpb.ListSnapshotsRequest, opts ...gax.CallOption) *SnapshotIterator { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", req.GetProject())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.ListSnapshots[0:len(c.CallOptions.ListSnapshots):len(c.CallOptions.ListSnapshots)], opts...) it := &SnapshotIterator{} @@ -464,7 +467,7 @@ func (c *SubscriberClient) ListSnapshots(ctx context.Context, req *pubsubpb.List // generated name is populated in the returned Snapshot object. Note that for // REST API requests, you must specify a name in the request. func (c *SubscriberClient) CreateSnapshot(ctx context.Context, req *pubsubpb.CreateSnapshotRequest, opts ...gax.CallOption) (*pubsubpb.Snapshot, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", req.GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.CreateSnapshot[0:len(c.CallOptions.CreateSnapshot):len(c.CallOptions.CreateSnapshot)], opts...) var resp *pubsubpb.Snapshot @@ -486,7 +489,7 @@ func (c *SubscriberClient) CreateSnapshot(ctx context.Context, req *pubsubpb.Cre // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. func (c *SubscriberClient) UpdateSnapshot(ctx context.Context, req *pubsubpb.UpdateSnapshotRequest, opts ...gax.CallOption) (*pubsubpb.Snapshot, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "snapshot.name", req.GetSnapshot().GetName())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "snapshot.name", url.QueryEscape(req.GetSnapshot().GetName()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.UpdateSnapshot[0:len(c.CallOptions.UpdateSnapshot):len(c.CallOptions.UpdateSnapshot)], opts...) var resp *pubsubpb.Snapshot @@ -512,7 +515,7 @@ func (c *SubscriberClient) UpdateSnapshot(ctx context.Context, req *pubsubpb.Upd // created with the same name, but the new one has no association with the old // snapshot or its subscription, unless the same subscription is specified. func (c *SubscriberClient) DeleteSnapshot(ctx context.Context, req *pubsubpb.DeleteSnapshotRequest, opts ...gax.CallOption) error { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "snapshot", req.GetSnapshot())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "snapshot", url.QueryEscape(req.GetSnapshot()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.DeleteSnapshot[0:len(c.CallOptions.DeleteSnapshot):len(c.CallOptions.DeleteSnapshot)], opts...) err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { @@ -532,7 +535,7 @@ func (c *SubscriberClient) DeleteSnapshot(ctx context.Context, req *pubsubpb.Del // captured by a snapshot. Note that both the subscription and the snapshot // must be on the same topic. func (c *SubscriberClient) Seek(ctx context.Context, req *pubsubpb.SeekRequest, opts ...gax.CallOption) (*pubsubpb.SeekResponse, error) { - md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", req.GetSubscription())) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "subscription", url.QueryEscape(req.GetSubscription()))) ctx = insertMetadata(ctx, c.xGoogMetadata, md) opts = append(c.CallOptions.Seek[0:len(c.CallOptions.Seek):len(c.CallOptions.Seek)], opts...) var resp *pubsubpb.SeekResponse diff --git a/vendor/cloud.google.com/go/pubsub/doc.go b/vendor/cloud.google.com/go/pubsub/doc.go index cd9b06d2ee90..a86fc3d4a594 100644 --- a/vendor/cloud.google.com/go/pubsub/doc.go +++ b/vendor/cloud.google.com/go/pubsub/doc.go @@ -48,6 +48,7 @@ background. To clean up these goroutines, call Stop: topic.Stop() + Receiving To receive messages published to a topic, clients create subscriptions @@ -72,10 +73,10 @@ Messages are then consumed from a subscription via callback. The callback is invoked concurrently by multiple goroutines, maximizing throughput. To terminate a call to Receive, cancel its context. -Once client code has processed the message, it must call Message.Ack, otherwise -the message will eventually be redelivered. As an optimization, if the client -cannot or doesn't want to process the message, it can call Message.Nack to -speed redelivery. For more information and configuration options, see +Once client code has processed the message, it must call Message.Ack or +message.Nack, otherwise the message will eventually be redelivered. If the +client cannot or doesn't want to process the message, it can call Message.Nack +to speed redelivery. For more information and configuration options, see "Deadlines" below. Note: It is possible for Messages to be redelivered, even if Message.Ack has @@ -86,6 +87,7 @@ may be surprising. Please take a look at https://cloud.google.com/pubsub/docs/pu for more details on how streaming pull behaves compared to the synchronous pull method. + Deadlines The default pubsub deadlines are suitable for most use cases, but may be @@ -128,6 +130,7 @@ subscription's AckDeadline: sub.ReceiveSettings.MaxExtension = cfg.AckDeadline + Slow Message Processing For use cases where message processing exceeds 30 minutes, we recommend using diff --git a/vendor/cloud.google.com/go/pubsub/go.mod b/vendor/cloud.google.com/go/pubsub/go.mod new file mode 100644 index 000000000000..a5567f788a9f --- /dev/null +++ b/vendor/cloud.google.com/go/pubsub/go.mod @@ -0,0 +1,17 @@ +module cloud.google.com/go/pubsub + +go 1.13 + +require ( + cloud.google.com/go v0.45.1 + github.com/golang/protobuf v1.3.2 + github.com/google/go-cmp v0.3.0 + github.com/googleapis/gax-go/v2 v2.0.5 + go.opencensus.io v0.22.0 + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 + google.golang.org/api v0.9.0 + google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 + google.golang.org/grpc v1.21.1 +) diff --git a/vendor/cloud.google.com/go/pubsub/go.sum b/vendor/cloud.google.com/go/pubsub/go.sum new file mode 100644 index 000000000000..a31819b8aa36 --- /dev/null +++ b/vendor/cloud.google.com/go/pubsub/go.sum @@ -0,0 +1,121 @@ +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/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= +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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +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 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +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/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +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/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +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-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 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +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 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +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-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-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +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 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +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 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= +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 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +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 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +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= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/cloud.google.com/go/pubsub/go_mod_tidy_hack.go b/vendor/cloud.google.com/go/pubsub/go_mod_tidy_hack.go new file mode 100644 index 000000000000..20b865930b9c --- /dev/null +++ b/vendor/cloud.google.com/go/pubsub/go_mod_tidy_hack.go @@ -0,0 +1,22 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the cloud.google.com/go import, won't actually become part of +// the resultant binary. +// +build modhack + +package pubsub + +// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "cloud.google.com/go" diff --git a/vendor/cloud.google.com/go/pubsub/internal/distribution/distribution.go b/vendor/cloud.google.com/go/pubsub/internal/distribution/distribution.go index 6571c90ac078..3c061fb1d8b4 100644 --- a/vendor/cloud.google.com/go/pubsub/internal/distribution/distribution.go +++ b/vendor/cloud.google.com/go/pubsub/internal/distribution/distribution.go @@ -18,6 +18,7 @@ import ( "log" "math" "sort" + "sync" "sync/atomic" ) @@ -25,12 +26,19 @@ import ( // goroutines. type D struct { buckets []uint64 + // sumsReuse is the scratch space that is reused + // to store sums during invocations of Percentile. + // After an invocation of New(n): + // len(buckets) == len(sumsReuse) == n + sumsReuse []uint64 + mu sync.Mutex } // New creates a new distribution capable of holding values from 0 to n-1. func New(n int) *D { return &D{ - buckets: make([]uint64, n), + buckets: make([]uint64, n), + sumsReuse: make([]uint64, n), } } @@ -48,7 +56,7 @@ func (d *D) Record(v int) { } // Percentile computes the p-th percentile of the distribution where -// p is between 0 and 1. This method is thread-safe. +// p is between 0 and 1. This method may be called by multiple goroutines. func (d *D) Percentile(p float64) int { // NOTE: This implementation uses the nearest-rank method. // https://en.wikipedia.org/wiki/Percentile#The_nearest-rank_method @@ -57,13 +65,15 @@ func (d *D) Percentile(p float64) int { log.Panicf("Percentile: percentile out of range: %f", p) } - sums := make([]uint64, len(d.buckets)) + d.mu.Lock() + defer d.mu.Unlock() + var sum uint64 - for i := range sums { + for i := range d.sumsReuse { sum += atomic.LoadUint64(&d.buckets[i]) - sums[i] = sum + d.sumsReuse[i] = sum } target := uint64(math.Ceil(float64(sum) * p)) - return sort.Search(len(sums), func(i int) bool { return sums[i] >= target }) + return sort.Search(len(d.sumsReuse), func(i int) bool { return d.sumsReuse[i] >= target }) } diff --git a/vendor/cloud.google.com/go/pubsub/iterator.go b/vendor/cloud.google.com/go/pubsub/iterator.go index 7cffa25ee071..b2455777d8eb 100644 --- a/vendor/cloud.google.com/go/pubsub/iterator.go +++ b/vendor/cloud.google.com/go/pubsub/iterator.go @@ -22,6 +22,7 @@ import ( vkit "cloud.google.com/go/pubsub/apiv1" "cloud.google.com/go/pubsub/internal/distribution" + "github.com/golang/protobuf/proto" gax "github.com/googleapis/gax-go/v2" pb "google.golang.org/genproto/googleapis/pubsub/v1" "google.golang.org/grpc" @@ -375,7 +376,9 @@ func (it *messageIterator) handleKeepAlives() { } func (it *messageIterator) sendAck(m map[string]bool) bool { - return it.sendAckIDRPC(m, func(ids []string) error { + // Account for the Subscription field. + overhead := calcFieldSizeString(it.subName) + return it.sendAckIDRPC(m, maxPayload-overhead, func(ids []string) error { recordStat(it.ctx, AckCount, int64(len(ids))) addAcks(ids) // Use context.Background() as the call's context, not it.ctx. We don't @@ -392,13 +395,16 @@ func (it *messageIterator) sendAck(m map[string]bool) bool { // percentile in order to capture the highest amount of time necessary without // considering 1% outliers. func (it *messageIterator) sendModAck(m map[string]bool, deadline time.Duration) bool { - return it.sendAckIDRPC(m, func(ids []string) error { + deadlineSec := int32(deadline / time.Second) + // Account for the Subscription and AckDeadlineSeconds fields. + overhead := calcFieldSizeString(it.subName) + calcFieldSizeInt(int(deadlineSec)) + return it.sendAckIDRPC(m, maxPayload-overhead, func(ids []string) error { if deadline == 0 { recordStat(it.ctx, NackCount, int64(len(ids))) } else { recordStat(it.ctx, ModAckCount, int64(len(ids))) } - addModAcks(ids, int32(deadline/time.Second)) + addModAcks(ids, deadlineSec) // Retry this RPC on Unavailable for a short amount of time, then give up // without returning a fatal error. The utility of this RPC is by nature // transient (since the deadline is relative to the current time) and it @@ -414,7 +420,7 @@ func (it *messageIterator) sendModAck(m map[string]bool, deadline time.Duration) for { err := it.subc.ModifyAckDeadline(cctx, &pb.ModifyAckDeadlineRequest{ Subscription: it.subName, - AckDeadlineSeconds: int32(deadline / time.Second), + AckDeadlineSeconds: deadlineSec, AckIds: ids, }) switch status.Code(err) { @@ -436,14 +442,14 @@ func (it *messageIterator) sendModAck(m map[string]bool, deadline time.Duration) }) } -func (it *messageIterator) sendAckIDRPC(ackIDSet map[string]bool, call func([]string) error) bool { +func (it *messageIterator) sendAckIDRPC(ackIDSet map[string]bool, maxSize int, call func([]string) error) bool { ackIDs := make([]string, 0, len(ackIDSet)) for k := range ackIDSet { ackIDs = append(ackIDs, k) } var toSend []string for len(ackIDs) > 0 { - toSend, ackIDs = splitRequestIDs(ackIDs, maxPayload) + toSend, ackIDs = splitRequestIDs(ackIDs, maxSize) if err := call(toSend); err != nil { // The underlying client handles retries, so any error is fatal to the // iterator. @@ -465,11 +471,35 @@ func (it *messageIterator) pingStream() { _ = it.ps.Send(&pb.StreamingPullRequest{}) } +// calcFieldSizeString returns the number of bytes string fields +// will take up in an encoded proto message. +func calcFieldSizeString(fields ...string) int { + overhead := 0 + for _, field := range fields { + overhead += 1 + len(field) + proto.SizeVarint(uint64(len(field))) + } + return overhead +} + +// calcFieldSizeInt returns the number of bytes int fields +// will take up in an encoded proto message. +func calcFieldSizeInt(fields ...int) int { + overhead := 0 + for _, field := range fields { + overhead += 1 + proto.SizeVarint(uint64(field)) + } + return overhead +} + +// splitRequestIDs takes a slice of ackIDs and returns two slices such that the first +// ackID slice can be used in a request where the payload does not exceed maxSize. func splitRequestIDs(ids []string, maxSize int) (prefix, remainder []string) { - size := reqFixedOverhead + size := 0 i := 0 + // TODO(hongalex): Use binary search to find split index, since ackIDs are + // fairly constant. for size < maxSize && i < len(ids) { - size += overheadPerID + len(ids[i]) + size += calcFieldSizeString(ids[i]) i++ } if size > maxSize { diff --git a/vendor/cloud.google.com/go/pubsub/pubsub.go b/vendor/cloud.google.com/go/pubsub/pubsub.go index cce9d6b25046..9dead694b997 100644 --- a/vendor/cloud.google.com/go/pubsub/pubsub.go +++ b/vendor/cloud.google.com/go/pubsub/pubsub.go @@ -84,7 +84,6 @@ func NewClient(ctx context.Context, projectID string, opts ...option.ClientOptio return nil, fmt.Errorf("pubsub: %v", err) } pubc.SetGoogleClientInfo("gccl", version.Repo) - subc.SetGoogleClientInfo("gccl", version.Repo) return &Client{ projectID: projectID, pubc: pubc, diff --git a/vendor/cloud.google.com/go/pubsub/service.go b/vendor/cloud.google.com/go/pubsub/service.go index b7358fe67ddf..a22b9147fccc 100644 --- a/vendor/cloud.google.com/go/pubsub/service.go +++ b/vendor/cloud.google.com/go/pubsub/service.go @@ -26,21 +26,14 @@ import ( "google.golang.org/grpc/status" ) -// maxPayload is the maximum number of bytes to devote to actual ids in -// acknowledgement or modifyAckDeadline requests. A serialized -// AcknowledgeRequest proto has a small constant overhead, plus the size of the -// subscription name, plus 3 bytes per ID (a tag byte and two size bytes). A -// ModifyAckDeadlineRequest has an additional few bytes for the deadline. We -// don't know the subscription name here, so we just assume the size exclusive -// of ids is 100 bytes. +// maxPayload is the maximum number of bytes to devote to the +// encoded AcknowledgementRequest / ModifyAckDeadline proto message. // // With gRPC there is no way for the client to know the server's max message size (it is // configurable on the server). We know from experience that it // it 512K. const ( maxPayload = 512 * 1024 - reqFixedOverhead = 100 - overheadPerID = 3 maxSendRecvBytes = 20 * 1024 * 1024 // 20M ) diff --git a/vendor/cloud.google.com/go/pubsub/snapshot.go b/vendor/cloud.google.com/go/pubsub/snapshot.go index d662f0d20e0f..c2a28d781990 100644 --- a/vendor/cloud.google.com/go/pubsub/snapshot.go +++ b/vendor/cloud.google.com/go/pubsub/snapshot.go @@ -106,7 +106,7 @@ func (s *Subscription) SeekToTime(ctx context.Context, t time.Time) error { } _, err = s.c.subc.Seek(ctx, &pb.SeekRequest{ Subscription: s.name, - Target: &pb.SeekRequest_Time{ts}, + Target: &pb.SeekRequest_Time{Time: ts}, }) return err } @@ -142,7 +142,7 @@ func (s *Subscription) CreateSnapshot(ctx context.Context, name string) (*Snapsh func (s *Subscription) SeekToSnapshot(ctx context.Context, snap *Snapshot) error { _, err := s.c.subc.Seek(ctx, &pb.SeekRequest{ Subscription: s.name, - Target: &pb.SeekRequest_Snapshot{snap.name}, + Target: &pb.SeekRequest_Snapshot{Snapshot: snap.name}, }) return err } diff --git a/vendor/cloud.google.com/go/pubsub/subscription.go b/vendor/cloud.google.com/go/pubsub/subscription.go index 1b65ea277640..bfd9dfb9279b 100644 --- a/vendor/cloud.google.com/go/pubsub/subscription.go +++ b/vendor/cloud.google.com/go/pubsub/subscription.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sync/errgroup" pb "google.golang.org/genproto/googleapis/pubsub/v1" fmpb "google.golang.org/genproto/protobuf/field_mask" - "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) // Subscription is a reference to a PubSub subscription. @@ -116,13 +116,80 @@ type PushConfig struct { // Endpoint configuration attributes. See https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#pushconfig for more details. Attributes map[string]string + + // AuthenticationMethod is used by push endpoints to verify the source + // of push requests. + // It can be used with push endpoints that are private by default to + // allow requests only from the Cloud Pub/Sub system, for example. + // This field is optional and should be set only by users interested in + // authenticated push. + // + // It is EXPERIMENTAL and a part of a closed alpha that may not be + // accessible to all users. This field is subject to change or removal + // without notice. + AuthenticationMethod AuthenticationMethod } func (pc *PushConfig) toProto() *pb.PushConfig { - return &pb.PushConfig{ + if pc == nil { + return nil + } + pbCfg := &pb.PushConfig{ Attributes: pc.Attributes, PushEndpoint: pc.Endpoint, } + if authMethod := pc.AuthenticationMethod; authMethod != nil { + switch am := authMethod.(type) { + case *OIDCToken: + pbCfg.AuthenticationMethod = am.toProto() + default: // TODO: add others here when GAIC adds more definitions. + } + } + return pbCfg +} + +// AuthenticationMethod is used by push points to verify the source of push requests. +// This interface defines fields that are part of a closed alpha that may not be accessible +// to all users. +type AuthenticationMethod interface { + isAuthMethod() bool +} + +// OIDCToken allows PushConfigs to be authenticated using +// the OpenID Connect protocol https://openid.net/connect/ +type OIDCToken struct { + // Audience to be used when generating OIDC token. The audience claim + // identifies the recipients that the JWT is intended for. The audience + // value is a single case-sensitive string. Having multiple values (array) + // for the audience field is not supported. More info about the OIDC JWT + // token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 + // Note: if not specified, the Push endpoint URL will be used. + Audience string + + // The service account email to be used for generating the OpenID Connect token. + // The caller of: + // * CreateSubscription + // * UpdateSubscription + // * ModifyPushConfig + // calls must have the iam.serviceAccounts.actAs permission for the service account. + // See https://cloud.google.com/iam/docs/understanding-roles#service-accounts-roles. + ServiceAccountEmail string +} + +var _ AuthenticationMethod = (*OIDCToken)(nil) + +func (oidcToken *OIDCToken) isAuthMethod() bool { return true } + +func (oidcToken *OIDCToken) toProto() *pb.PushConfig_OidcToken_ { + if oidcToken == nil { + return nil + } + return &pb.PushConfig_OidcToken_{ + OidcToken: &pb.PushConfig_OidcToken{ + Audience: oidcToken.Audience, + ServiceAccountEmail: oidcToken.ServiceAccountEmail, + }, + } } // SubscriptionConfig describes the configuration of a subscription. @@ -153,8 +220,10 @@ type SubscriptionConfig struct { // *default policy* with `ttl` of 31 days will be used. The minimum allowed // value for `expiration_policy.ttl` is 1 day. // + // Use time.Duration(0) to indicate that the subscription should never expire. + // // It is EXPERIMENTAL and subject to change or removal without notice. - ExpirationPolicy time.Duration + ExpirationPolicy optional.Duration // The set of labels for the subscription. Labels map[string]string @@ -162,11 +231,8 @@ type SubscriptionConfig struct { func (cfg *SubscriptionConfig) toProto(name string) *pb.Subscription { var pbPushConfig *pb.PushConfig - if cfg.PushConfig.Endpoint != "" || len(cfg.PushConfig.Attributes) != 0 { - pbPushConfig = &pb.PushConfig{ - Attributes: cfg.PushConfig.Attributes, - PushEndpoint: cfg.PushConfig.Endpoint, - } + if cfg.PushConfig.Endpoint != "" || len(cfg.PushConfig.Attributes) != 0 || cfg.PushConfig.AuthenticationMethod != nil { + pbPushConfig = cfg.PushConfig.toProto() } var retentionDuration *durpb.Duration if cfg.RetentionDuration != 0 { @@ -200,18 +266,38 @@ func protoToSubscriptionConfig(pbSub *pb.Subscription, c *Client) (SubscriptionC return SubscriptionConfig{}, err } } - return SubscriptionConfig{ - Topic: newTopic(c, pbSub.Topic), - AckDeadline: time.Second * time.Duration(pbSub.AckDeadlineSeconds), - PushConfig: PushConfig{ - Endpoint: pbSub.PushConfig.PushEndpoint, - Attributes: pbSub.PushConfig.Attributes, - }, + subC := SubscriptionConfig{ + Topic: newTopic(c, pbSub.Topic), + AckDeadline: time.Second * time.Duration(pbSub.AckDeadlineSeconds), RetainAckedMessages: pbSub.RetainAckedMessages, RetentionDuration: rd, Labels: pbSub.Labels, ExpirationPolicy: expirationPolicy, - }, nil + } + pc := protoToPushConfig(pbSub.PushConfig) + if pc != nil { + subC.PushConfig = *pc + } + return subC, nil +} + +func protoToPushConfig(pbPc *pb.PushConfig) *PushConfig { + if pbPc == nil { + return nil + } + pc := &PushConfig{ + Endpoint: pbPc.PushEndpoint, + Attributes: pbPc.Attributes, + } + if am := pbPc.AuthenticationMethod; am != nil { + if oidcToken, ok := am.(*pb.PushConfig_OidcToken_); ok && oidcToken != nil && oidcToken.OidcToken != nil { + pc.AuthenticationMethod = &OIDCToken{ + Audience: oidcToken.OidcToken.GetAudience(), + ServiceAccountEmail: oidcToken.OidcToken.GetServiceAccountEmail(), + } + } + } + return pc } // ReceiveSettings configure the Receive method. @@ -301,7 +387,7 @@ func (s *Subscription) Exists(ctx context.Context) (bool, error) { if err == nil { return true, nil } - if grpc.Code(err) == codes.NotFound { + if status.Code(err) == codes.NotFound { return false, nil } return false, err @@ -335,7 +421,7 @@ type SubscriptionConfigToUpdate struct { RetentionDuration time.Duration // If non-zero, Expiration is changed. - ExpirationPolicy time.Duration + ExpirationPolicy optional.Duration // If non-nil, the current set of labels is completely // replaced by the new set. @@ -382,7 +468,7 @@ func (s *Subscription) updateRequest(cfg *SubscriptionConfigToUpdate) *pb.Update psub.MessageRetentionDuration = ptypes.DurationProto(cfg.RetentionDuration) paths = append(paths, "message_retention_duration") } - if cfg.ExpirationPolicy != 0 { + if cfg.ExpirationPolicy != nil { psub.ExpirationPolicy = expirationPolicyToProto(cfg.ExpirationPolicy) paths = append(paths, "expiration_policy") } @@ -407,21 +493,31 @@ const ( ) func (cfg *SubscriptionConfigToUpdate) validate() error { - if cfg == nil || cfg.ExpirationPolicy == 0 { + if cfg == nil || cfg.ExpirationPolicy == nil { return nil } - if policy, min := cfg.ExpirationPolicy, minExpirationPolicy; policy < min { - return fmt.Errorf("invalid expiration policy(%q) < minimum(%q)", policy, min) + policy, min := optional.ToDuration(cfg.ExpirationPolicy), minExpirationPolicy + if policy == 0 || policy >= min { + return nil } - return nil + return fmt.Errorf("invalid expiration policy(%q) < minimum(%q)", policy, min) } -func expirationPolicyToProto(expirationPolicy time.Duration) *pb.ExpirationPolicy { - if expirationPolicy == 0 { +func expirationPolicyToProto(expirationPolicy optional.Duration) *pb.ExpirationPolicy { + if expirationPolicy == nil { return nil } + + dur := optional.ToDuration(expirationPolicy) + var ttl *durpb.Duration + // As per: + // https://godoc.org/google.golang.org/genproto/googleapis/pubsub/v1#ExpirationPolicy.Ttl + // if ExpirationPolicy.Ttl is set to nil, the expirationPolicy is toggled to NEVER expire. + if dur != 0 { + ttl = ptypes.DurationProto(dur) + } return &pb.ExpirationPolicy{ - Ttl: ptypes.DurationProto(expirationPolicy), + Ttl: ttl, } } diff --git a/vendor/cloud.google.com/go/pubsub/topic.go b/vendor/cloud.google.com/go/pubsub/topic.go index 7c3af3561f38..2b31431ed93d 100644 --- a/vendor/cloud.google.com/go/pubsub/topic.go +++ b/vendor/cloud.google.com/go/pubsub/topic.go @@ -18,6 +18,7 @@ import ( "context" "errors" "fmt" + "log" "runtime" "strings" "sync" @@ -26,11 +27,14 @@ import ( "cloud.google.com/go/iam" "github.com/golang/protobuf/proto" gax "github.com/googleapis/gax-go/v2" + "go.opencensus.io/stats" + "go.opencensus.io/tag" "google.golang.org/api/support/bundler" pb "google.golang.org/genproto/googleapis/pubsub/v1" fmpb "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) const ( @@ -104,13 +108,16 @@ var DefaultPublishSettings = PublishSettings{ } // CreateTopic creates a new topic. +// // The specified topic ID must start with a letter, and contain only letters // ([A-Za-z]), numbers ([0-9]), dashes (-), underscores (_), periods (.), // tildes (~), plus (+) or percent signs (%). It must be between 3 and 255 -// characters in length, and must not start with "goog". +// characters in length, and must not start with "goog". For more information, +// see: https://cloud.google.com/pubsub/docs/admin#resource_names +// // If the topic already exists an error will be returned. -func (c *Client) CreateTopic(ctx context.Context, id string) (*Topic, error) { - t := c.Topic(id) +func (c *Client) CreateTopic(ctx context.Context, topicID string) (*Topic, error) { + t := c.Topic(topicID) _, err := c.pubc.CreateTopic(ctx, &pb.Topic{Name: t.name}) if err != nil { return nil, err @@ -118,6 +125,29 @@ func (c *Client) CreateTopic(ctx context.Context, id string) (*Topic, error) { return t, nil } +// CreateTopicWithConfig creates a topic from TopicConfig. +// +// The specified topic ID must start with a letter, and contain only letters +// ([A-Za-z]), numbers ([0-9]), dashes (-), underscores (_), periods (.), +// tildes (~), plus (+) or percent signs (%). It must be between 3 and 255 +// characters in length, and must not start with "goog". For more information, +// see: https://cloud.google.com/pubsub/docs/admin#resource_names. +// +// If the topic already exists, an error will be returned. +func (c *Client) CreateTopicWithConfig(ctx context.Context, topicID string, tc *TopicConfig) (*Topic, error) { + t := c.Topic(topicID) + _, err := c.pubc.CreateTopic(ctx, &pb.Topic{ + Name: t.name, + Labels: tc.Labels, + MessageStoragePolicy: messageStoragePolicyToProto(&tc.MessageStoragePolicy), + KmsKeyName: tc.KMSKeyName, + }) + if err != nil { + return nil, err + } + return t, nil +} + // Topic creates a reference to a topic in the client's project. // // If a Topic's Publish method is called, it has background goroutines @@ -150,23 +180,40 @@ func newTopic(c *Client, name string) *Topic { type TopicConfig struct { // The set of labels for the topic. Labels map[string]string + // The topic's message storage policy. MessageStoragePolicy MessageStoragePolicy + + // The name of the Cloud KMS key to be used to protect access to messages + // published to this topic, in the format + // "projects/P/locations/L/keyRings/R/cryptoKeys/K". + KMSKeyName string } // TopicConfigToUpdate describes how to update a topic. type TopicConfigToUpdate struct { // If non-nil, the current set of labels is completely // replaced by the new set. + Labels map[string]string + + // If non-nil, the existing policy (containing the list of regions) + // is completely replaced by the new policy. + // + // Use the zero value &MessageStoragePolicy{} to reset the topic back to + // using the organization's Resource Location Restriction policy. + // + // If nil, the policy remains unchanged. + // // This field has beta status. It is not subject to the stability guarantee // and may change. - Labels map[string]string + MessageStoragePolicy *MessageStoragePolicy } func protoToTopicConfig(pbt *pb.Topic) TopicConfig { return TopicConfig{ Labels: pbt.Labels, MessageStoragePolicy: protoToMessageStoragePolicy(pbt.MessageStoragePolicy), + KMSKeyName: pbt.KmsKeyName, } } @@ -174,12 +221,19 @@ func protoToTopicConfig(pbt *pb.Topic) TopicConfig { // is determined when the topic is created based on the policy configured at // the project level. type MessageStoragePolicy struct { - // The list of GCP regions where messages that are published to the topic may - // be persisted in storage. Messages published by publishers running in + // AllowedPersistenceRegions is the list of GCP regions where messages that are published + // to the topic may be persisted in storage. Messages published by publishers running in // non-allowed GCP regions (or running outside of GCP altogether) will be - // routed for storage in one of the allowed regions. An empty list indicates a - // misconfiguration at the project or organization level, which will result in - // all Publish operations failing. + // routed for storage in one of the allowed regions. + // + // If empty, it indicates a misconfiguration at the project or organization level, which + // will result in all Publish operations failing. This field cannot be empty in updates. + // + // If nil, then the policy is not defined on a topic level. When used in updates, it resets + // the regions back to the organization level Resource Location Restriction policy. + // + // For more information, see + // https://cloud.google.com/pubsub/docs/resource-location-restriction#pubsub-storage-locations. AllowedPersistenceRegions []string } @@ -190,6 +244,13 @@ func protoToMessageStoragePolicy(msp *pb.MessageStoragePolicy) MessageStoragePol return MessageStoragePolicy{AllowedPersistenceRegions: msp.AllowedPersistenceRegions} } +func messageStoragePolicyToProto(msp *MessageStoragePolicy) *pb.MessageStoragePolicy { + if msp == nil || msp.AllowedPersistenceRegions == nil { + return nil + } + return &pb.MessageStoragePolicy{AllowedPersistenceRegions: msp.AllowedPersistenceRegions} +} + // Config returns the TopicConfig for the topic. func (t *Topic) Config(ctx context.Context) (TopicConfig, error) { pbt, err := t.c.pubc.GetTopic(ctx, &pb.GetTopicRequest{Topic: t.name}) @@ -201,9 +262,6 @@ func (t *Topic) Config(ctx context.Context) (TopicConfig, error) { // Update changes an existing topic according to the fields set in cfg. It returns // the new TopicConfig. -// -// Any call to Update (even with an empty TopicConfigToUpdate) will update the -// MessageStoragePolicy for the topic from the organization's settings. func (t *Topic) Update(ctx context.Context, cfg TopicConfigToUpdate) (TopicConfig, error) { req := t.updateRequest(cfg) if len(req.UpdateMask.Paths) == 0 { @@ -218,11 +276,15 @@ func (t *Topic) Update(ctx context.Context, cfg TopicConfigToUpdate) (TopicConfi func (t *Topic) updateRequest(cfg TopicConfigToUpdate) *pb.UpdateTopicRequest { pt := &pb.Topic{Name: t.name} - paths := []string{"message_storage_policy"} // always fetch + var paths []string if cfg.Labels != nil { pt.Labels = cfg.Labels paths = append(paths, "labels") } + if cfg.MessageStoragePolicy != nil { + pt.MessageStoragePolicy = messageStoragePolicyToProto(cfg.MessageStoragePolicy) + paths = append(paths, "message_storage_policy") + } return &pb.UpdateTopicRequest{ Topic: pt, UpdateMask: &fmpb.FieldMask{Paths: paths}, @@ -288,7 +350,7 @@ func (t *Topic) Exists(ctx context.Context) (bool, error) { if err == nil { return true, nil } - if grpc.Code(err) == codes.NotFound { + if status.Code(err) == codes.NotFound { return false, nil } return false, err @@ -451,6 +513,10 @@ func (t *Topic) initBundler() { } func (t *Topic) publishMessageBundle(ctx context.Context, bms []*bundledMessage) { + ctx, err := tag.New(ctx, tag.Insert(keyStatus, "OK"), tag.Upsert(keyTopic, t.name)) + if err != nil { + log.Printf("pubsub: cannot create context with tag in publishMessageBundle: %v", err) + } pbMsgs := make([]*pb.PubsubMessage, len(bms)) for i, bm := range bms { pbMsgs[i] = &pb.PubsubMessage{ @@ -459,10 +525,21 @@ func (t *Topic) publishMessageBundle(ctx context.Context, bms []*bundledMessage) } bm.msg = nil // release bm.msg for GC } + start := time.Now() res, err := t.c.pubc.Publish(ctx, &pb.PublishRequest{ Topic: t.name, Messages: pbMsgs, }, gax.WithGRPCOptions(grpc.MaxCallSendMsgSize(maxSendRecvBytes))) + end := time.Now() + if err != nil { + // Update context with error tag for OpenCensus, + // using same stats.Record() call as success case. + ctx, _ = tag.New(ctx, tag.Upsert(keyStatus, "ERROR"), + tag.Upsert(keyError, err.Error())) + } + stats.Record(ctx, + PublishLatency.M(float64(end.Sub(start)/time.Millisecond)), + PublishedMessages.M(int64(len(bms)))) for i, bm := range bms { if err != nil { bm.res.set("", err) diff --git a/vendor/cloud.google.com/go/pubsub/trace.go b/vendor/cloud.google.com/go/pubsub/trace.go index 06965c2a2d11..d21d37c84345 100644 --- a/vendor/cloud.google.com/go/pubsub/trace.go +++ b/vendor/cloud.google.com/go/pubsub/trace.go @@ -33,18 +33,31 @@ func openCensusOptions() []option.ClientOption { } } -var subscriptionKey tag.Key +// The following keys are used to tag requests with a specific topic/subscription ID. +var ( + keyTopic = tag.MustNewKey("topic") + keySubscription = tag.MustNewKey("subscription") +) -func init() { - var err error - if subscriptionKey, err = tag.NewKey("subscription"); err != nil { - log.Fatal("cannot create 'subscription' key") - } -} +// In the following, errors are used if status is not "OK". +var ( + keyStatus = tag.MustNewKey("status") + keyError = tag.MustNewKey("error") +) const statsPrefix = "cloud.google.com/go/pubsub/" +// The following are measures recorded in publish/subscribe flows. var ( + // PublishedMessages is a measure of the number of messages published, which may include errors. + // It is EXPERIMENTAL and subject to change or removal without notice. + PublishedMessages = stats.Int64(statsPrefix+"published_messages", "Number of PubSub message published", stats.UnitDimensionless) + + // PublishLatency is a measure of the number of milliseconds it took to publish a bundle, + // which may consist of one or more messages. + // It is EXPERIMENTAL and subject to change or removal without notice. + PublishLatency = stats.Float64(statsPrefix+"publish_roundtrip_latency", "The latency in milliseconds per publish batch", stats.UnitMilliseconds) + // PullCount is a measure of the number of messages pulled. // It is EXPERIMENTAL and subject to change or removal without notice. PullCount = stats.Int64(statsPrefix+"pull_count", "Number of PubSub messages pulled", stats.UnitDimensionless) @@ -80,6 +93,16 @@ var ( // StreamResponseCount is a measure of the number of responses received on a streaming-pull stream. // It is EXPERIMENTAL and subject to change or removal without notice. StreamResponseCount = stats.Int64(statsPrefix+"stream_response_count", "Number of gRPC StreamingPull response messages received", stats.UnitDimensionless) +) + +var ( + // PublishedMessagesView is a cumulative sum of PublishedMessages. + // It is EXPERIMENTAL and subject to change or removal without notice. + PublishedMessagesView *view.View + + // PublishLatencyView is a distribution of PublishLatency. + // It is EXPERIMENTAL and subject to change or removal without notice. + PublishLatencyView *view.View // PullCountView is a cumulative sum of PullCount. // It is EXPERIMENTAL and subject to change or removal without notice. @@ -119,34 +142,71 @@ var ( ) func init() { - PullCountView = countView(PullCount) - AckCountView = countView(AckCount) - NackCountView = countView(NackCount) - ModAckCountView = countView(ModAckCount) - ModAckTimeoutCountView = countView(ModAckTimeoutCount) - StreamOpenCountView = countView(StreamOpenCount) - StreamRetryCountView = countView(StreamRetryCount) - StreamRequestCountView = countView(StreamRequestCount) - StreamResponseCountView = countView(StreamResponseCount) + PublishedMessagesView = createCountView(stats.Measure(PublishedMessages), keyTopic, keyStatus, keyError) + PublishLatencyView = createDistView(PublishLatency, keyTopic, keyStatus, keyError) + PullCountView = createCountView(PullCount, keySubscription) + AckCountView = createCountView(AckCount, keySubscription) + NackCountView = createCountView(NackCount, keySubscription) + ModAckCountView = createCountView(ModAckCount, keySubscription) + ModAckTimeoutCountView = createCountView(ModAckTimeoutCount, keySubscription) + StreamOpenCountView = createCountView(StreamOpenCount, keySubscription) + StreamRetryCountView = createCountView(StreamRetryCount, keySubscription) + StreamRequestCountView = createCountView(StreamRequestCount, keySubscription) + StreamResponseCountView = createCountView(StreamResponseCount, keySubscription) + + DefaultPublishViews = []*view.View{ + PublishedMessagesView, + PublishLatencyView, + } + + DefaultSubscribeViews = []*view.View{ + PullCountView, + AckCountView, + NackCountView, + ModAckCountView, + ModAckTimeoutCountView, + StreamOpenCountView, + StreamRetryCountView, + StreamRequestCountView, + StreamResponseCountView, + } } -func countView(m *stats.Int64Measure) *view.View { +// The following arrays are the default views related to publish/subscribe operations provided by this package. +// It is EXPERIMENTAL and subject to change or removal without notice. +var ( + DefaultPublishViews []*view.View + DefaultSubscribeViews []*view.View +) + +func createCountView(m stats.Measure, keys ...tag.Key) *view.View { return &view.View{ Name: m.Name(), Description: m.Description(), - TagKeys: []tag.Key{subscriptionKey}, + TagKeys: keys, Measure: m, Aggregation: view.Sum(), } } +func createDistView(m stats.Measure, keys ...tag.Key) *view.View { + return &view.View{ + Name: m.Name(), + Description: m.Description(), + TagKeys: keys, + Measure: m, + Aggregation: view.Distribution(0, 25, 50, 75, 100, 200, 400, 600, 800, 1000, 2000, 4000, 6000), + } +} + var logOnce sync.Once +// withSubscriptionKey returns a new context modified with the subscriptionKey tag map. func withSubscriptionKey(ctx context.Context, subName string) context.Context { - ctx, err := tag.New(ctx, tag.Upsert(subscriptionKey, subName)) + ctx, err := tag.New(ctx, tag.Upsert(keySubscription, subName)) if err != nil { logOnce.Do(func() { - log.Printf("pubsub: error creating tag map: %v", err) + log.Printf("pubsub: error creating tag map for 'subscribe' key: %v", err) }) } return ctx diff --git a/vendor/cloud.google.com/go/storage/.repo-metadata.json b/vendor/cloud.google.com/go/storage/.repo-metadata.json new file mode 100644 index 000000000000..a42f91cd35f1 --- /dev/null +++ b/vendor/cloud.google.com/go/storage/.repo-metadata.json @@ -0,0 +1,12 @@ +{ + "name": "storage", + "name_pretty": "storage", + "product_documentation": "https://cloud.google.com/storage", + "client_documentation": "https://godoc.org/cloud.google.com/go/storage", + "release_level": "ga", + "language": "go", + "repo": "googleapis/google-cloud-go", + "distribution_name": "cloud.google.com/go/storage", + "api_id": "storage:v2", + "requires_billing": true +} diff --git a/vendor/cloud.google.com/go/storage/CHANGES.md b/vendor/cloud.google.com/go/storage/CHANGES.md new file mode 100644 index 000000000000..952fff68e8e3 --- /dev/null +++ b/vendor/cloud.google.com/go/storage/CHANGES.md @@ -0,0 +1,6 @@ +# Changes + +## v1.0.0 + +This is the first tag to carve out storage as its own module. See: +https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository. \ No newline at end of file diff --git a/vendor/github.com/google/certificate-transparency-go/LICENSE b/vendor/cloud.google.com/go/storage/LICENSE similarity index 100% rename from vendor/github.com/google/certificate-transparency-go/LICENSE rename to vendor/cloud.google.com/go/storage/LICENSE diff --git a/vendor/cloud.google.com/go/storage/bucket.go b/vendor/cloud.google.com/go/storage/bucket.go index 07c470d3e0d4..0ba45e8f8e71 100644 --- a/vendor/cloud.google.com/go/storage/bucket.go +++ b/vendor/cloud.google.com/go/storage/bucket.go @@ -267,14 +267,8 @@ type BucketAttrs struct { // StorageClass is the default storage class of the bucket. This defines // how objects in the bucket are stored and determines the SLA - // and the cost of storage. Typical values are "MULTI_REGIONAL", - // "REGIONAL", "NEARLINE", "COLDLINE", "STANDARD" and - // "DURABLE_REDUCED_AVAILABILITY". Defaults to "STANDARD", which - // is equivalent to "MULTI_REGIONAL" or "REGIONAL" depending on - // the bucket's location settings. - // - // "DURABLE_REDUCED_AVAILABILITY", "MULTI_REGIONAL" and "REGIONAL" - // are considered legacy storage classes. + // and the cost of storage. Typical values are "NEARLINE", "COLDLINE" and + // "STANDARD". Defaults to "STANDARD". StorageClass string // Created is the creation time of the bucket. @@ -446,8 +440,7 @@ type LifecycleCondition struct { // MatchesStorageClasses is the condition matching the object's storage // class. // - // Values include "MULTI_REGIONAL", "REGIONAL", "NEARLINE", "COLDLINE", - // "STANDARD", and "DURABLE_REDUCED_AVAILABILITY". + // Values include "NEARLINE", "COLDLINE" and "STANDARD". MatchesStorageClasses []string // NumNewerVersions is the condition matching objects with a number of newer versions. diff --git a/vendor/cloud.google.com/go/storage/go.mod b/vendor/cloud.google.com/go/storage/go.mod new file mode 100644 index 000000000000..ce68c9daaaaa --- /dev/null +++ b/vendor/cloud.google.com/go/storage/go.mod @@ -0,0 +1,14 @@ +module cloud.google.com/go/storage + +go 1.9 + +require ( + cloud.google.com/go v0.46.3 + github.com/golang/protobuf v1.3.2 + github.com/google/go-cmp v0.3.0 + github.com/googleapis/gax-go/v2 v2.0.5 + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 + google.golang.org/api v0.9.0 + google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 + google.golang.org/grpc v1.21.1 +) diff --git a/vendor/cloud.google.com/go/storage/go.sum b/vendor/cloud.google.com/go/storage/go.sum new file mode 100644 index 000000000000..96d9ee7c0dac --- /dev/null +++ b/vendor/cloud.google.com/go/storage/go.sum @@ -0,0 +1,156 @@ +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.1/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1 h1:hL+ycaJpVE9M7nLoiXb/Pn10ENE2u+oddxbD8uu0ZVU= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.0.0/go.mod h1:SdFEKccng5n2jTXm5x01uXEvi4MBzxWFR6YI781XSJI= +cloud.google.com/go/pubsub v1.0.1 h1:W9tAK3E57P75u0XLLR82LZyw8VpAnhmyTOxW9qzmyj8= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +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 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +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 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +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/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +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/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 h1:Agxu5KLo8o7Bb634SVDnhIfpTvxmzUwhbYAzBvXt6h4= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +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 h1:8R1esu+8QioDxo4E4mX6bFztO+dMTM49DNAaWfO5OeY= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/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/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-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 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +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 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +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-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-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 h1:On1qIo75ByTwFJ4/W2bIqHcwJ9XAqtSWUs8GwRrIhtc= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/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 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +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 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= +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 h1:Ex1mq5jaJof+kRnYi3SlYJ8KKa9Ao3NHyIT5XJ1gF6U= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +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 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +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= +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 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +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/vendor/cloud.google.com/go/storage/go_mod_tidy_hack.go b/vendor/cloud.google.com/go/storage/go_mod_tidy_hack.go new file mode 100644 index 000000000000..7df7a1d7155a --- /dev/null +++ b/vendor/cloud.google.com/go/storage/go_mod_tidy_hack.go @@ -0,0 +1,22 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the cloud.google.com/go import, won't actually become part of +// the resultant binary. +// +build modhack + +package storage + +// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "cloud.google.com/go" diff --git a/vendor/cloud.google.com/go/storage/hmac.go b/vendor/cloud.google.com/go/storage/hmac.go index a906d44fe013..c39632740e35 100644 --- a/vendor/cloud.google.com/go/storage/hmac.go +++ b/vendor/cloud.google.com/go/storage/hmac.go @@ -20,6 +20,7 @@ import ( "fmt" "time" + "google.golang.org/api/iterator" raw "google.golang.org/api/storage/v1" ) @@ -47,7 +48,7 @@ const ( // HMAC keys are used to authenticate signed access to objects. To enable HMAC key // authentication, please visit https://cloud.google.com/storage/docs/migrating. // -// This type is experimental and subject to change. +// This type is EXPERIMENTAL and subject to change or removal without notice. type HMACKey struct { // The HMAC's secret key. Secret string @@ -82,7 +83,7 @@ type HMACKey struct { // HMACKeyHandle helps provide access and management for HMAC keys. // -// This type is experimental and subject to change. +// This type is EXPERIMENTAL and subject to change or removal without notice. type HMACKeyHandle struct { projectID string accessID string @@ -91,6 +92,8 @@ type HMACKeyHandle struct { } // HMACKeyHandle creates a handle that will be used for HMACKey operations. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. func (c *Client) HMACKeyHandle(projectID, accessID string) *HMACKeyHandle { return &HMACKeyHandle{ projectID: projectID, @@ -101,6 +104,8 @@ func (c *Client) HMACKeyHandle(projectID, accessID string) *HMACKeyHandle { // Get invokes an RPC to retrieve the HMAC key referenced by the // HMACKeyHandle's accessID. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. func (hkh *HMACKeyHandle) Get(ctx context.Context) (*HMACKey, error) { call := hkh.raw.Get(hkh.projectID, hkh.accessID) setClientHeader(call.Header()) @@ -124,6 +129,8 @@ func (hkh *HMACKeyHandle) Get(ctx context.Context) (*HMACKey, error) { // Delete invokes an RPC to delete the key referenced by accessID, on Google Cloud Storage. // Only inactive HMAC keys can be deleted. // After deletion, a key cannot be used to authenticate requests. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. func (hkh *HMACKeyHandle) Delete(ctx context.Context) error { delCall := hkh.raw.Delete(hkh.projectID, hkh.accessID) setClientHeader(delCall.Header()) @@ -133,7 +140,7 @@ func (hkh *HMACKeyHandle) Delete(ctx context.Context) error { }) } -func pbHmacKeyToHMACKey(pb *raw.HmacKey, isCreate bool) (*HMACKey, error) { +func pbHmacKeyToHMACKey(pb *raw.HmacKey, updatedTimeCanBeNil bool) (*HMACKey, error) { pbmd := pb.Metadata if pbmd == nil { return nil, errors.New("field Metadata cannot be nil") @@ -143,7 +150,7 @@ func pbHmacKeyToHMACKey(pb *raw.HmacKey, isCreate bool) (*HMACKey, error) { return nil, fmt.Errorf("field CreatedTime: %v", err) } updatedTime, err := time.Parse(time.RFC3339, pbmd.Updated) - if err != nil && !isCreate { + if err != nil && !updatedTimeCanBeNil { return nil, fmt.Errorf("field UpdatedTime: %v", err) } @@ -164,6 +171,8 @@ func pbHmacKeyToHMACKey(pb *raw.HmacKey, isCreate bool) (*HMACKey, error) { } // CreateHMACKey invokes an RPC for Google Cloud Storage to create a new HMACKey. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. func (c *Client) CreateHMACKey(ctx context.Context, projectID, serviceAccountEmail string) (*HMACKey, error) { if projectID == "" { return nil, errors.New("storage: expecting a non-blank projectID") @@ -190,6 +199,8 @@ func (c *Client) CreateHMACKey(ctx context.Context, projectID, serviceAccountEma } // HMACKeyAttrsToUpdate defines the attributes of an HMACKey that will be updated. +// +// This type is EXPERIMENTAL and subject to change or removal without notice. type HMACKeyAttrsToUpdate struct { // State is required and must be either StateActive or StateInactive. State HMACState @@ -199,6 +210,8 @@ type HMACKeyAttrsToUpdate struct { } // Update mutates the HMACKey referred to by accessID. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. func (h *HMACKeyHandle) Update(ctx context.Context, au HMACKeyAttrsToUpdate) (*HMACKey, error) { if au.State != Active && au.State != Inactive { return nil, fmt.Errorf("storage: invalid state %q for update, must be either %q or %q", au.State, Active, Inactive) @@ -225,3 +238,150 @@ func (h *HMACKeyHandle) Update(ctx context.Context, au HMACKeyAttrsToUpdate) (*H } return pbHmacKeyToHMACKey(hkPb, false) } + +// An HMACKeysIterator is an iterator over HMACKeys. +// +// This type is EXPERIMENTAL and subject to change or removal without notice. +type HMACKeysIterator struct { + ctx context.Context + raw *raw.ProjectsHmacKeysService + projectID string + hmacKeys []*HMACKey + pageInfo *iterator.PageInfo + nextFunc func() error + index int + desc hmacKeyDesc +} + +// ListHMACKeys returns an iterator for listing HMACKeys. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. +func (c *Client) ListHMACKeys(ctx context.Context, projectID string, opts ...HMACKeyOption) *HMACKeysIterator { + it := &HMACKeysIterator{ + ctx: ctx, + raw: raw.NewProjectsHmacKeysService(c.raw), + projectID: projectID, + } + + for _, opt := range opts { + opt.withHMACKeyDesc(&it.desc) + } + + it.pageInfo, it.nextFunc = iterator.NewPageInfo( + it.fetch, + func() int { return len(it.hmacKeys) - it.index }, + func() interface{} { + prev := it.hmacKeys + it.hmacKeys = it.hmacKeys[:0] + it.index = 0 + return prev + }) + return it +} + +// Next returns the next result. Its second return value is iterator.Done if +// there are no more results. Once Next returns iterator.Done, all subsequent +// calls will return iterator.Done. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. +func (it *HMACKeysIterator) Next() (*HMACKey, error) { + if err := it.nextFunc(); err != nil { + return nil, err + } + + key := it.hmacKeys[it.index] + it.index++ + + return key, nil +} + +// PageInfo supports pagination. See the google.golang.org/api/iterator package for details. +// +// This method is EXPERIMENTAL and subject to change or removal without notice. +func (it *HMACKeysIterator) PageInfo() *iterator.PageInfo { return it.pageInfo } + +func (it *HMACKeysIterator) fetch(pageSize int, pageToken string) (token string, err error) { + call := it.raw.List(it.projectID) + setClientHeader(call.Header()) + if pageToken != "" { + call = call.PageToken(pageToken) + } + if it.desc.showDeletedKeys { + call = call.ShowDeletedKeys(true) + } + if it.desc.userProjectID != "" { + call = call.UserProject(it.desc.userProjectID) + } + if it.desc.forServiceAccountEmail != "" { + call = call.ServiceAccountEmail(it.desc.forServiceAccountEmail) + } + if pageSize > 0 { + call = call.MaxResults(int64(pageSize)) + } + + ctx := it.ctx + var resp *raw.HmacKeysMetadata + err = runWithRetry(it.ctx, func() error { + resp, err = call.Context(ctx).Do() + return err + }) + if err != nil { + return "", err + } + + for _, metadata := range resp.Items { + hkPb := &raw.HmacKey{ + Metadata: metadata, + } + hkey, err := pbHmacKeyToHMACKey(hkPb, true) + if err != nil { + return "", err + } + it.hmacKeys = append(it.hmacKeys, hkey) + } + return resp.NextPageToken, nil +} + +type hmacKeyDesc struct { + forServiceAccountEmail string + showDeletedKeys bool + userProjectID string +} + +// HMACKeyOption configures the behavior of HMACKey related methods and actions. +type HMACKeyOption interface { + withHMACKeyDesc(*hmacKeyDesc) +} + +type hmacKeyDescFunc func(*hmacKeyDesc) + +func (hkdf hmacKeyDescFunc) withHMACKeyDesc(hkd *hmacKeyDesc) { + hkdf(hkd) +} + +// ForHMACKeyServiceAccountEmail returns HMAC Keys that are +// associated with the email address of a service account in the project. +// +// Only one service account email can be used as a filter, so if multiple +// of these options are applied, the last email to be set will be used. +func ForHMACKeyServiceAccountEmail(serviceAccountEmail string) HMACKeyOption { + return hmacKeyDescFunc(func(hkd *hmacKeyDesc) { + hkd.forServiceAccountEmail = serviceAccountEmail + }) +} + +// ShowDeletedHMACKeys will also list keys whose state is "DELETED". +func ShowDeletedHMACKeys() HMACKeyOption { + return hmacKeyDescFunc(func(hkd *hmacKeyDesc) { + hkd.showDeletedKeys = true + }) +} + +// HMACKeysForUserProject will bill the request against userProjectID. +// +// Note: This is a noop right now and only provided for API compatibility. +func HMACKeysForUserProject(userProjectID string) HMACKeyOption { + return hmacKeyDescFunc(func(hkd *hmacKeyDesc) { + hkd.userProjectID = userProjectID + }) +} diff --git a/vendor/cloud.google.com/go/storage/reader.go b/vendor/cloud.google.com/go/storage/reader.go index dbed8ac1bc99..5c83651bd9b7 100644 --- a/vendor/cloud.google.com/go/storage/reader.go +++ b/vendor/cloud.google.com/go/storage/reader.go @@ -43,6 +43,11 @@ type ReaderObjectAttrs struct { // Size is the length of the object's content. Size int64 + // StartOffset is the byte offset within the object + // from which reading begins. + // This value is only non-zero for range requests. + StartOffset int64 + // ContentType is the MIME type of the object's content. ContentType string @@ -78,7 +83,9 @@ func (o *ObjectHandle) NewReader(ctx context.Context) (*Reader, error) { // NewRangeReader reads part of an object, reading at most length bytes // starting at the given offset. If length is negative, the object is read -// until the end. +// until the end. If offset is negative, the object is read abs(offset) bytes +// from the end, and length must also be negative to indicate all remaining +// bytes will be read. func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) (r *Reader, err error) { ctx = trace.StartSpan(ctx, "cloud.google.com/go/storage.Object.NewRangeReader") defer func() { trace.EndSpan(ctx, err) }() @@ -86,8 +93,8 @@ func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) if err := o.validate(); err != nil { return nil, err } - if offset < 0 { - return nil, fmt.Errorf("storage: invalid offset %d < 0", offset) + if offset < 0 && length >= 0 { + return nil, fmt.Errorf("storage: invalid offset %d < 0 requires negative length", offset) } if o.conds != nil { if err := o.conds.validate("NewRangeReader"); err != nil { @@ -124,7 +131,9 @@ func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) // have already read seen bytes. reopen := func(seen int64) (*http.Response, error) { start := offset + seen - if length < 0 && start > 0 { + if length < 0 && start < 0 { + req.Header.Set("Range", fmt.Sprintf("bytes=%d", start)) + } else if length < 0 && start > 0 { req.Header.Set("Range", fmt.Sprintf("bytes=%d-", start)) } else if length > 0 { // The end character isn't affected by how many bytes we've seen. @@ -177,20 +186,28 @@ func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) return nil, err } var ( - size int64 // total size of object, even if a range was requested. - checkCRC bool - crc uint32 + size int64 // total size of object, even if a range was requested. + checkCRC bool + crc uint32 + startOffset int64 // non-zero if range request. ) if res.StatusCode == http.StatusPartialContent { cr := strings.TrimSpace(res.Header.Get("Content-Range")) if !strings.HasPrefix(cr, "bytes ") || !strings.Contains(cr, "/") { - return nil, fmt.Errorf("storage: invalid Content-Range %q", cr) } size, err = strconv.ParseInt(cr[strings.LastIndex(cr, "/")+1:], 10, 64) if err != nil { return nil, fmt.Errorf("storage: invalid Content-Range %q", cr) } + + dashIndex := strings.Index(cr, "-") + if dashIndex >= 0 { + startOffset, err = strconv.ParseInt(cr[len("bytes="):dashIndex], 10, 64) + if err != nil { + return nil, fmt.Errorf("storage: invalid Content-Range %q: %v", cr, err) + } + } } else { size = res.ContentLength // Check the CRC iff all of the following hold: @@ -236,6 +253,7 @@ func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) ContentEncoding: res.Header.Get("Content-Encoding"), CacheControl: res.Header.Get("Cache-Control"), LastModified: lm, + StartOffset: startOffset, Generation: gen, Metageneration: metaGen, } diff --git a/vendor/cloud.google.com/go/storage/storage.go b/vendor/cloud.google.com/go/storage/storage.go index d35bd7568e79..1ffb10f6446e 100644 --- a/vendor/cloud.google.com/go/storage/storage.go +++ b/vendor/cloud.google.com/go/storage/storage.go @@ -992,10 +992,8 @@ type ObjectAttrs struct { // StorageClass is the storage class of the object. // This value defines how objects in the bucket are stored and // determines the SLA and the cost of storage. Typical values are - // "MULTI_REGIONAL", "REGIONAL", "NEARLINE", "COLDLINE", "STANDARD" - // and "DURABLE_REDUCED_AVAILABILITY". - // It defaults to "STANDARD", which is equivalent to "MULTI_REGIONAL" - // or "REGIONAL" depending on the bucket's location settings. + // "NEARLINE", "COLDLINE" and "STANDARD". + // It defaults to "STANDARD". StorageClass string // Created is the time the object was created. This field is read-only. diff --git a/vendor/cloud.google.com/go/storage/writer.go b/vendor/cloud.google.com/go/storage/writer.go index 0f52414b84c7..a11659212870 100644 --- a/vendor/cloud.google.com/go/storage/writer.go +++ b/vendor/cloud.google.com/go/storage/writer.go @@ -148,21 +148,16 @@ func (w *Writer) open() error { call.UserProject(w.o.userProject) } setClientHeader(call.Header()) - // If the chunk size is zero, then no chunking is done on the Reader, - // which means we cannot retry: the first call will read the data, and if - // it fails, there is no way to re-read. - if w.ChunkSize == 0 { - resp, err = call.Do() - } else { - // We will only retry here if the initial POST, which obtains a URI for - // the resumable upload, fails with a retryable error. The upload itself - // has its own retry logic. - err = runWithRetry(w.ctx, func() error { - var err2 error - resp, err2 = call.Do() - return err2 - }) - } + + // The internals that perform call.Do automatically retry + // uploading chunks, hence no need to add retries here. + // See issue https://github.com/googleapis/google-cloud-go/issues/1507. + // + // However, since this whole call's internals involve making the initial + // resumable upload session, the first HTTP request is not retried. + // TODO: Follow-up with google.golang.org/gensupport to solve + // https://github.com/googleapis/google-api-go-client/issues/392. + resp, err = call.Do() } if err != nil { w.mu.Lock() @@ -231,7 +226,7 @@ func (w *Writer) Close() error { } // monitorCancel is intended to be used as a background goroutine. It monitors the -// the context, and when it observes that the context has been canceled, it manually +// context, and when it observes that the context has been canceled, it manually // closes things that do not take a context. func (w *Writer) monitorCancel() { select { diff --git a/vendor/cloud.google.com/go/tools.go b/vendor/cloud.google.com/go/tools.go new file mode 100644 index 000000000000..fa01cc44ccc4 --- /dev/null +++ b/vendor/cloud.google.com/go/tools.go @@ -0,0 +1,33 @@ +// +build tools + +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This package exists to cause `go mod` and `go get` to believe these tools +// are dependencies, even though they are not runtime dependencies of any +// package (these are tools used by our CI builds). This means they will appear +// in our `go.mod` file, but will not be a part of the build. Also, since the +// build target is something non-existent, these should not be included in any +// binaries. + +package cloud + +import ( + _ "github.com/golang/protobuf/protoc-gen-go" + _ "github.com/jstemmer/go-junit-report" + _ "golang.org/x/exp/cmd/apidiff" + _ "golang.org/x/lint/golint" + _ "golang.org/x/tools/cmd/goimports" + _ "honnef.co/go/tools/cmd/staticcheck" +) diff --git a/vendor/code.cloudfoundry.org/go-diodes/.travis.yml b/vendor/code.cloudfoundry.org/go-diodes/.travis.yml new file mode 100644 index 000000000000..a9992c4da7a6 --- /dev/null +++ b/vendor/code.cloudfoundry.org/go-diodes/.travis.yml @@ -0,0 +1,17 @@ +language: go + +go: + - 1.x + - master + +install: | + mkdir -p $HOME/gopath/src/code.cloudfoundry.org/go-diodes + rsync -az ${TRAVIS_BUILD_DIR}/ $HOME/gopath/src/code.cloudfoundry.org/go-diodes/ + export TRAVIS_BUILD_DIR=$GOPATH/src/code.cloudfoundry.org/go-diodes + go get -t -d -v code.cloudfoundry.org/go-diodes/... + +script: go test code.cloudfoundry.org/go-diodes/... --race + +matrix: + allow_failures: + - go: master diff --git a/vendor/code.cloudfoundry.org/go-loggregator/.gitignore b/vendor/code.cloudfoundry.org/go-loggregator/.gitignore new file mode 100644 index 000000000000..723ef36f4e4f --- /dev/null +++ b/vendor/code.cloudfoundry.org/go-loggregator/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/go-loggregator/.travis.yml b/vendor/code.cloudfoundry.org/go-loggregator/.travis.yml new file mode 100644 index 000000000000..7034555ad27d --- /dev/null +++ b/vendor/code.cloudfoundry.org/go-loggregator/.travis.yml @@ -0,0 +1,21 @@ +language: go + +go: +- 1.10.x +- 1.11.x +- master + +install: | + mkdir -p $HOME/gopath/src/code.cloudfoundry.org/go-loggregator + rsync -az ${TRAVIS_BUILD_DIR}/ $HOME/gopath/src/code.cloudfoundry.org/go-loggregator/ + export TRAVIS_BUILD_DIR=$GOPATH/src/code.cloudfoundry.org/go-loggregator + go get -t -d -v code.cloudfoundry.org/go-loggregator/... + +script: | + cd $GOPATH + cd src/code.cloudfoundry.org/go-loggregator + go test ./... + +matrix: + allow_failures: + - go: master diff --git a/vendor/code.cloudfoundry.org/go-loggregator/go.mod b/vendor/code.cloudfoundry.org/go-loggregator/go.mod deleted file mode 100644 index 753f656bb9cf..000000000000 --- a/vendor/code.cloudfoundry.org/go-loggregator/go.mod +++ /dev/null @@ -1,33 +0,0 @@ -module code.cloudfoundry.org/go-loggregator - -go 1.12 - -require ( - code.cloudfoundry.org/go-diodes v0.0.0-20180905200951-72629b5276e3 - code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a - github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect - github.com/cloudfoundry/dropsonde v1.0.0 - github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35 // indirect - github.com/cloudfoundry/loggregatorlib v0.0.0-20170823162133-36eddf15ef12 // indirect - github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 - github.com/gogo/protobuf v1.2.1 - github.com/golang/protobuf v1.3.2 - github.com/kr/pretty v0.1.0 // indirect - github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect - github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect - github.com/onsi/ginkgo v1.8.0 - github.com/onsi/gomega v1.5.0 - github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect - github.com/prometheus/client_golang v1.0.0 - github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 - github.com/prometheus/common v0.6.0 - github.com/prometheus/procfs v0.0.3 // indirect - golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 - golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect - golang.org/x/text v0.3.2 // indirect - google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 // indirect - google.golang.org/grpc v1.22.1 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect - gopkg.in/yaml.v2 v2.2.2 // indirect - launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect -) diff --git a/vendor/code.cloudfoundry.org/go-loggregator/go.sum b/vendor/code.cloudfoundry.org/go-loggregator/go.sum deleted file mode 100644 index 4ce889217e4b..000000000000 --- a/vendor/code.cloudfoundry.org/go-loggregator/go.sum +++ /dev/null @@ -1,158 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.cloudfoundry.org/go-diodes v0.0.0-20180905200951-72629b5276e3 h1:oHsfl5AaineZubAUOXg2Vxcdu/TzgN/Q+/65lN70LZk= -code.cloudfoundry.org/go-diodes v0.0.0-20180905200951-72629b5276e3/go.mod h1:Jzi+ccHgo/V/PLQUaQ6hnZcC1c4BS790gx21LRRui4g= -code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a h1:8rqv2w8xEceNwckcF5ONeRt0qBHlh5bnNfFnYTrZbxs= -code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -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/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM= -github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudfoundry/dropsonde v1.0.0 h1:9MT6WFmhU96fQjhTiglx4b1X3ObNjk/Sze7KPntNitE= -github.com/cloudfoundry/dropsonde v1.0.0/go.mod h1:6zwvrWK5TpxBVYi1cdkE5WDsIO8E0n7qAJg3wR9B67c= -github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35 h1:HdAWGlVEbFxuALqHXYu14XvAbRbyWZLd817ojygGnk0= -github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35/go.mod h1:3YBPUR85RIrvaUTdA1dL38YSp6s3OHu1xrWLkGt2Mog= -github.com/cloudfoundry/loggregatorlib v0.0.0-20170823162133-36eddf15ef12 h1:A+SRy/ndY6QSrN+bVWIhKDLU4t7OLFWVlLPxUWL/oGE= -github.com/cloudfoundry/loggregatorlib v0.0.0-20170823162133-36eddf15ef12/go.mod h1:ucj7+svyACshmxV3Zze2NAcEcdbBf9scZYR+QKCX9/w= -github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI= -github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -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 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -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/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -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/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -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/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg= -github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -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= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -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-20180906233101-161cd47e91fd/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-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-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180909124046-d0be0721c37e/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 h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -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/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 h1:Ygq9/SRJX9+dU0WCIICM8RkWvDw03lvB77hrhJnpxfU= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.22.1 h1:/7cs52RnTJmD43s3uxzlq2U7nqVTd/37viQwMrMNlOM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -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/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/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= -launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= diff --git a/vendor/code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/generate.sh b/vendor/code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/generate.sh old mode 100755 new mode 100644 diff --git a/vendor/code.cloudfoundry.org/rfc5424/.travis.yml b/vendor/code.cloudfoundry.org/rfc5424/.travis.yml new file mode 100644 index 000000000000..d15fd7c0f860 --- /dev/null +++ b/vendor/code.cloudfoundry.org/rfc5424/.travis.yml @@ -0,0 +1,5 @@ +language: go + +go: + - 1.10 + - 1.11 diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md b/vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md deleted file mode 100644 index 0786fdf43468..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md +++ /dev/null @@ -1,24 +0,0 @@ -# How to contribute - -We'd love to accept your patches and contributions to this project. There are -just a few small guidelines you need to follow. - -## Contributor License Agreement - -Contributions to this project must be accompanied by a Contributor License -Agreement. You (or your employer) retain the copyright to your contribution, -this simply gives us permission to use and redistribute your contributions as -part of the project. Head over to to see -your current agreements on file or to sign a new one. - -You generally only need to submit a CLA once, so if you've already submitted one -(even if it was for a different project), you probably don't need to do it -again. - -## Code reviews - -All submissions, including submissions by project members, require review. We -use GitHub pull requests for this purpose. Consult [GitHub Help] for more -information on using pull requests. - -[GitHub Help]: https://help.github.com/articles/about-pull-requests/ diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE b/vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE deleted file mode 100644 index 261eeb9e9f8b..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/README.md b/vendor/contrib.go.opencensus.io/exporter/ocagent/README.md deleted file mode 100644 index 3b9e908f5967..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# OpenCensus Agent Go Exporter - -[![Build Status][travis-image]][travis-url] [![GoDoc][godoc-image]][godoc-url] - - -This repository contains the Go implementation of the OpenCensus Agent (OC-Agent) Exporter. -OC-Agent is a deamon process running in a VM that can retrieve spans/stats/metrics from -OpenCensus Library, export them to other backends and possibly push configurations back to -Library. See more details on [OC-Agent Readme][OCAgentReadme]. - -Note: This is an experimental repository and is likely to get backwards-incompatible changes. -Ultimately we may want to move the OC-Agent Go Exporter to [OpenCensus Go core library][OpenCensusGo]. - -## Installation - -```bash -$ go get -u contrib.go.opencensus.io/exporter/ocagent -``` - -## Usage - -```go -import ( - "context" - "fmt" - "log" - "time" - - "contrib.go.opencensus.io/exporter/ocagent" - "go.opencensus.io/trace" -) - -func Example() { - exp, err := ocagent.NewExporter(ocagent.WithInsecure(), ocagent.WithServiceName("your-service-name")) - if err != nil { - log.Fatalf("Failed to create the agent exporter: %v", err) - } - defer exp.Stop() - - // Now register it as a trace exporter. - trace.RegisterExporter(exp) - - // Then use the OpenCensus tracing library, like we normally would. - ctx, span := trace.StartSpan(context.Background(), "AgentExporter-Example") - defer span.End() - - for i := 0; i < 10; i++ { - _, iSpan := trace.StartSpan(ctx, fmt.Sprintf("Sample-%d", i)) - <-time.After(6 * time.Millisecond) - iSpan.End() - } -} -``` - -[OCAgentReadme]: https://github.com/census-instrumentation/opencensus-proto/tree/master/opencensus/proto/agent#opencensus-agent-proto -[OpenCensusGo]: https://github.com/census-instrumentation/opencensus-go -[godoc-image]: https://godoc.org/contrib.go.opencensus.io/exporter/ocagent?status.svg -[godoc-url]: https://godoc.org/contrib.go.opencensus.io/exporter/ocagent -[travis-image]: https://travis-ci.org/census-ecosystem/opencensus-go-exporter-ocagent.svg?branch=master -[travis-url]: https://travis-ci.org/census-ecosystem/opencensus-go-exporter-ocagent - diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/common.go b/vendor/contrib.go.opencensus.io/exporter/ocagent/common.go deleted file mode 100644 index 297e44b6e76d..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/common.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2018, OpenCensus Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ocagent - -import ( - "math/rand" - "time" -) - -var randSrc = rand.New(rand.NewSource(time.Now().UnixNano())) - -// retries function fn upto n times, if fn returns an error lest it returns nil early. -// It applies exponential backoff in units of (1< 0 { - ctx = metadata.NewOutgoingContext(ctx, metadata.New(ae.headers)) - } - traceExporter, err := traceSvcClient.Export(ctx) - if err != nil { - return fmt.Errorf("Exporter.Start:: TraceServiceClient: %v", err) - } - - firstTraceMessage := &agenttracepb.ExportTraceServiceRequest{ - Node: node, - Resource: ae.resource, - } - if err := traceExporter.Send(firstTraceMessage); err != nil { - return fmt.Errorf("Exporter.Start:: Failed to initiate the Config service: %v", err) - } - - ae.mu.Lock() - ae.traceExporter = traceExporter - ae.mu.Unlock() - - // Initiate the config service by sending over node identifier info. - configStream, err := traceSvcClient.Config(context.Background()) - if err != nil { - return fmt.Errorf("Exporter.Start:: ConfigStream: %v", err) - } - firstCfgMessage := &agenttracepb.CurrentLibraryConfig{Node: node} - if err := configStream.Send(firstCfgMessage); err != nil { - return fmt.Errorf("Exporter.Start:: Failed to initiate the Config service: %v", err) - } - - // In the background, handle trace configurations that are beamed down - // by the agent, but also reply to it with the applied configuration. - go ae.handleConfigStreaming(configStream) - - return nil -} - -func (ae *Exporter) createMetricsServiceConnection(cc *grpc.ClientConn, node *commonpb.Node) error { - metricsSvcClient := agentmetricspb.NewMetricsServiceClient(cc) - metricsExporter, err := metricsSvcClient.Export(context.Background()) - if err != nil { - return fmt.Errorf("MetricsExporter: failed to start the service client: %v", err) - } - // Initiate the metrics service by sending over the first message just containing the Node and Resource. - firstMetricsMessage := &agentmetricspb.ExportMetricsServiceRequest{ - Node: node, - Resource: ae.resource, - } - if err := metricsExporter.Send(firstMetricsMessage); err != nil { - return fmt.Errorf("MetricsExporter:: failed to send the first message: %v", err) - } - - ae.mu.Lock() - ae.metricsExporter = metricsExporter - ae.mu.Unlock() - - // With that we are good to go and can start sending metrics - return nil -} - -func (ae *Exporter) dialToAgent() (*grpc.ClientConn, error) { - addr := ae.prepareAgentAddress() - var dialOpts []grpc.DialOption - if ae.clientTransportCredentials != nil { - dialOpts = append(dialOpts, grpc.WithTransportCredentials(ae.clientTransportCredentials)) - } else if ae.canDialInsecure { - dialOpts = append(dialOpts, grpc.WithInsecure()) - } - if ae.compressor != "" { - dialOpts = append(dialOpts, grpc.WithDefaultCallOptions(grpc.UseCompressor(ae.compressor))) - } - dialOpts = append(dialOpts, grpc.WithStatsHandler(&ocgrpc.ClientHandler{})) - if len(ae.grpcDialOptions) != 0 { - dialOpts = append(dialOpts, ae.grpcDialOptions...) - } - - ctx := context.Background() - if len(ae.headers) > 0 { - ctx = metadata.NewOutgoingContext(ctx, metadata.New(ae.headers)) - } - return grpc.DialContext(ctx, addr, dialOpts...) -} - -func (ae *Exporter) handleConfigStreaming(configStream agenttracepb.TraceService_ConfigClient) error { - // Note: We haven't yet implemented configuration sending so we - // should NOT be changing connection states within this function for now. - for { - recv, err := configStream.Recv() - if err != nil { - // TODO: Check if this is a transient error or exponential backoff-able. - return err - } - cfg := recv.Config - if cfg == nil { - continue - } - - // Otherwise now apply the trace configuration sent down from the agent - if psamp := cfg.GetProbabilitySampler(); psamp != nil { - trace.ApplyConfig(trace.Config{DefaultSampler: trace.ProbabilitySampler(psamp.SamplingProbability)}) - } else if csamp := cfg.GetConstantSampler(); csamp != nil { - alwaysSample := csamp.Decision == tracepb.ConstantSampler_ALWAYS_ON - if alwaysSample { - trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) - } else { - trace.ApplyConfig(trace.Config{DefaultSampler: trace.NeverSample()}) - } - } else { // TODO: Add the rate limiting sampler here - } - - // Then finally send back to upstream the newly applied configuration - err = configStream.Send(&agenttracepb.CurrentLibraryConfig{Config: &tracepb.TraceConfig{Sampler: cfg.Sampler}}) - if err != nil { - return err - } - } -} - -// Stop shuts down all the connections and resources -// related to the exporter. -func (ae *Exporter) Stop() error { - ae.mu.RLock() - cc := ae.grpcClientConn - started := ae.started - stopped := ae.stopped - ae.mu.RUnlock() - - if !started { - return errNotStarted - } - if stopped { - // TODO: tell the user that we've already stopped, so perhaps a sentinel error? - return nil - } - - ae.Flush() - - // Now close the underlying gRPC connection. - var err error - if cc != nil { - err = cc.Close() - } - - // At this point we can change the state variables: started and stopped - ae.mu.Lock() - ae.started = false - ae.stopped = true - ae.mu.Unlock() - close(ae.stopCh) - - // Ensure that the backgroundConnector returns - <-ae.backgroundConnectionDoneCh - - return err -} - -func (ae *Exporter) ExportSpan(sd *trace.SpanData) { - if sd == nil { - return - } - _ = ae.traceBundler.Add(sd, 1) -} - -func (ae *Exporter) ExportTraceServiceRequest(batch *agenttracepb.ExportTraceServiceRequest) error { - if batch == nil || len(batch.Spans) == 0 { - return nil - } - - select { - case <-ae.stopCh: - return errStopped - - default: - if lastConnectErr := ae.lastConnectError(); lastConnectErr != nil { - return fmt.Errorf("ExportTraceServiceRequest: no active connection, last connection error: %v", lastConnectErr) - } - - ae.senderMu.Lock() - err := ae.traceExporter.Send(batch) - ae.senderMu.Unlock() - if err != nil { - if err == io.EOF { - ae.recvMu.Lock() - // Perform a .Recv to try to find out why the RPC actually ended. - // See: - // * https://github.com/grpc/grpc-go/blob/d389f9fac68eea0dcc49957d0b4cca5b3a0a7171/stream.go#L98-L100 - // * https://groups.google.com/forum/#!msg/grpc-io/XcN4hA9HonI/F_UDiejTAwAJ - for { - _, err = ae.traceExporter.Recv() - if err != nil { - break - } - } - ae.recvMu.Unlock() - } - - ae.setStateDisconnected(err) - if err != io.EOF { - return err - } - } - return nil - } -} - -func (ae *Exporter) ExportView(vd *view.Data) { - if vd == nil { - return - } - _ = ae.viewDataBundler.Add(vd, 1) -} - -func ocSpanDataToPbSpans(sdl []*trace.SpanData) []*tracepb.Span { - if len(sdl) == 0 { - return nil - } - protoSpans := make([]*tracepb.Span, 0, len(sdl)) - for _, sd := range sdl { - if sd != nil { - protoSpans = append(protoSpans, ocSpanToProtoSpan(sd)) - } - } - return protoSpans -} - -func (ae *Exporter) uploadTraces(sdl []*trace.SpanData) { - select { - case <-ae.stopCh: - return - - default: - if !ae.connected() { - return - } - - protoSpans := ocSpanDataToPbSpans(sdl) - if len(protoSpans) == 0 { - return - } - ae.senderMu.Lock() - err := ae.traceExporter.Send(&agenttracepb.ExportTraceServiceRequest{ - Spans: protoSpans, - }) - ae.senderMu.Unlock() - if err != nil { - ae.setStateDisconnected(err) - } - } -} - -func ocViewDataToPbMetrics(vdl []*view.Data) []*metricspb.Metric { - if len(vdl) == 0 { - return nil - } - metrics := make([]*metricspb.Metric, 0, len(vdl)) - for _, vd := range vdl { - if vd != nil { - vmetric, err := viewDataToMetric(vd) - // TODO: (@odeke-em) somehow report this error, if it is non-nil. - if err == nil && vmetric != nil { - metrics = append(metrics, vmetric) - } - } - } - return metrics -} - -func (ae *Exporter) uploadViewData(vdl []*view.Data) { - select { - case <-ae.stopCh: - return - - default: - if !ae.connected() { - return - } - - protoMetrics := ocViewDataToPbMetrics(vdl) - if len(protoMetrics) == 0 { - return - } - err := ae.metricsExporter.Send(&agentmetricspb.ExportMetricsServiceRequest{ - Metrics: protoMetrics, - // TODO:(@odeke-em) - // a) Figure out how to derive a Node from the environment - // b) Figure out how to derive a Resource from the environment - // or better letting users of the exporter configure it. - }) - if err != nil { - ae.setStateDisconnected(err) - } - } -} - -func (ae *Exporter) Flush() { - ae.traceBundler.Flush() - ae.viewDataBundler.Flush() -} - -func resourceProtoFromEnv() *resourcepb.Resource { - rs, _ := resource.FromEnv(context.Background()) - if rs == nil { - return nil - } - return resourceToResourcePb(rs) -} - -func resourceToResourcePb(rs *resource.Resource) *resourcepb.Resource { - rprs := &resourcepb.Resource{ - Type: rs.Type, - } - if rs.Labels != nil { - rprs.Labels = make(map[string]string) - for k, v := range rs.Labels { - rprs.Labels[k] = v - } - } - return rprs -} diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/options.go b/vendor/contrib.go.opencensus.io/exporter/ocagent/options.go deleted file mode 100644 index 6820216f3bce..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/options.go +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2018, OpenCensus Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ocagent - -import ( - "time" - - "go.opencensus.io/resource" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" -) - -const ( - DefaultAgentPort uint16 = 55678 - DefaultAgentHost string = "localhost" -) - -type ExporterOption interface { - withExporter(e *Exporter) -} - -type resourceDetector resource.Detector - -var _ ExporterOption = (*resourceDetector)(nil) - -func (rd resourceDetector) withExporter(e *Exporter) { - e.resourceDetector = resource.Detector(rd) -} - -// WithResourceDetector allows one to register a resource detector. Resource Detector is used -// to detect resources associated with the application. Detected resource is exported -// along with the metrics. If the detector fails then it panics. -// If a resource detector is not provided then by default it detects from the environment. -func WithResourceDetector(rd resource.Detector) ExporterOption { - return resourceDetector(rd) -} - -type insecureGrpcConnection int - -var _ ExporterOption = (*insecureGrpcConnection)(nil) - -func (igc *insecureGrpcConnection) withExporter(e *Exporter) { - e.canDialInsecure = true -} - -// WithInsecure disables client transport security for the exporter's gRPC connection -// just like grpc.WithInsecure() https://godoc.org/google.golang.org/grpc#WithInsecure -// does. Note, by default, client security is required unless WithInsecure is used. -func WithInsecure() ExporterOption { return new(insecureGrpcConnection) } - -type addressSetter string - -func (as addressSetter) withExporter(e *Exporter) { - e.agentAddress = string(as) -} - -var _ ExporterOption = (*addressSetter)(nil) - -// WithAddress allows one to set the address that the exporter will -// connect to the agent on. If unset, it will instead try to use -// connect to DefaultAgentHost:DefaultAgentPort -func WithAddress(addr string) ExporterOption { - return addressSetter(addr) -} - -type serviceNameSetter string - -func (sns serviceNameSetter) withExporter(e *Exporter) { - e.serviceName = string(sns) -} - -var _ ExporterOption = (*serviceNameSetter)(nil) - -// WithServiceName allows one to set/override the service name -// that the exporter will report to the agent. -func WithServiceName(serviceName string) ExporterOption { - return serviceNameSetter(serviceName) -} - -type reconnectionPeriod time.Duration - -func (rp reconnectionPeriod) withExporter(e *Exporter) { - e.reconnectionPeriod = time.Duration(rp) -} - -func WithReconnectionPeriod(rp time.Duration) ExporterOption { - return reconnectionPeriod(rp) -} - -type compressorSetter string - -func (c compressorSetter) withExporter(e *Exporter) { - e.compressor = string(c) -} - -// UseCompressor will set the compressor for the gRPC client to use when sending requests. -// It is the responsibility of the caller to ensure that the compressor set has been registered -// with google.golang.org/grpc/encoding. This can be done by encoding.RegisterCompressor. Some -// compressors auto-register on import, such as gzip, which can be registered by calling -// `import _ "google.golang.org/grpc/encoding/gzip"` -func UseCompressor(compressorName string) ExporterOption { - return compressorSetter(compressorName) -} - -type headerSetter map[string]string - -func (h headerSetter) withExporter(e *Exporter) { - e.headers = map[string]string(h) -} - -// WithHeaders will send the provided headers when the gRPC stream connection -// is instantiated -func WithHeaders(headers map[string]string) ExporterOption { - return headerSetter(headers) -} - -type clientCredentials struct { - credentials.TransportCredentials -} - -var _ ExporterOption = (*clientCredentials)(nil) - -// WithTLSCredentials allows the connection to use TLS credentials -// when talking to the server. It takes in grpc.TransportCredentials instead -// of say a Certificate file or a tls.Certificate, because the retrieving -// these credentials can be done in many ways e.g. plain file, in code tls.Config -// or by certificate rotation, so it is up to the caller to decide what to use. -func WithTLSCredentials(creds credentials.TransportCredentials) ExporterOption { - return &clientCredentials{TransportCredentials: creds} -} - -func (cc *clientCredentials) withExporter(e *Exporter) { - e.clientTransportCredentials = cc.TransportCredentials -} - -type grpcDialOptions []grpc.DialOption - -var _ ExporterOption = (*grpcDialOptions)(nil) - -// WithGRPCDialOption opens support to any grpc.DialOption to be used. If it conflicts -// with some other configuration the GRPC specified via the agent the ones here will -// take preference since they are set last. -func WithGRPCDialOption(opts ...grpc.DialOption) ExporterOption { - return grpcDialOptions(opts) -} - -func (opts grpcDialOptions) withExporter(e *Exporter) { - e.grpcDialOptions = opts -} diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_spans.go b/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_spans.go deleted file mode 100644 index 983ebe7b70f2..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_spans.go +++ /dev/null @@ -1,248 +0,0 @@ -// Copyright 2018, OpenCensus Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ocagent - -import ( - "math" - "time" - - "go.opencensus.io/trace" - "go.opencensus.io/trace/tracestate" - - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/golang/protobuf/ptypes/timestamp" -) - -const ( - maxAnnotationEventsPerSpan = 32 - maxMessageEventsPerSpan = 128 -) - -func ocSpanToProtoSpan(sd *trace.SpanData) *tracepb.Span { - if sd == nil { - return nil - } - var namePtr *tracepb.TruncatableString - if sd.Name != "" { - namePtr = &tracepb.TruncatableString{Value: sd.Name} - } - return &tracepb.Span{ - TraceId: sd.TraceID[:], - SpanId: sd.SpanID[:], - ParentSpanId: sd.ParentSpanID[:], - Status: ocStatusToProtoStatus(sd.Status), - StartTime: timeToTimestamp(sd.StartTime), - EndTime: timeToTimestamp(sd.EndTime), - Links: ocLinksToProtoLinks(sd.Links), - Kind: ocSpanKindToProtoSpanKind(sd.SpanKind), - Name: namePtr, - Attributes: ocAttributesToProtoAttributes(sd.Attributes), - TimeEvents: ocTimeEventsToProtoTimeEvents(sd.Annotations, sd.MessageEvents), - Tracestate: ocTracestateToProtoTracestate(sd.Tracestate), - } -} - -var blankStatus trace.Status - -func ocStatusToProtoStatus(status trace.Status) *tracepb.Status { - if status == blankStatus { - return nil - } - return &tracepb.Status{ - Code: status.Code, - Message: status.Message, - } -} - -func ocLinksToProtoLinks(links []trace.Link) *tracepb.Span_Links { - if len(links) == 0 { - return nil - } - - sl := make([]*tracepb.Span_Link, 0, len(links)) - for _, ocLink := range links { - // This redefinition is necessary to prevent ocLink.*ID[:] copies - // being reused -- in short we need a new ocLink per iteration. - ocLink := ocLink - - sl = append(sl, &tracepb.Span_Link{ - TraceId: ocLink.TraceID[:], - SpanId: ocLink.SpanID[:], - Type: ocLinkTypeToProtoLinkType(ocLink.Type), - }) - } - - return &tracepb.Span_Links{ - Link: sl, - } -} - -func ocLinkTypeToProtoLinkType(oct trace.LinkType) tracepb.Span_Link_Type { - switch oct { - case trace.LinkTypeChild: - return tracepb.Span_Link_CHILD_LINKED_SPAN - case trace.LinkTypeParent: - return tracepb.Span_Link_PARENT_LINKED_SPAN - default: - return tracepb.Span_Link_TYPE_UNSPECIFIED - } -} - -func ocAttributesToProtoAttributes(attrs map[string]interface{}) *tracepb.Span_Attributes { - if len(attrs) == 0 { - return nil - } - outMap := make(map[string]*tracepb.AttributeValue) - for k, v := range attrs { - switch v := v.(type) { - case bool: - outMap[k] = &tracepb.AttributeValue{Value: &tracepb.AttributeValue_BoolValue{BoolValue: v}} - - case int: - outMap[k] = &tracepb.AttributeValue{Value: &tracepb.AttributeValue_IntValue{IntValue: int64(v)}} - - case int64: - outMap[k] = &tracepb.AttributeValue{Value: &tracepb.AttributeValue_IntValue{IntValue: v}} - - case string: - outMap[k] = &tracepb.AttributeValue{ - Value: &tracepb.AttributeValue_StringValue{ - StringValue: &tracepb.TruncatableString{Value: v}, - }, - } - } - } - return &tracepb.Span_Attributes{ - AttributeMap: outMap, - } -} - -// This code is mostly copied from -// https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/blob/master/trace_proto.go#L46 -func ocTimeEventsToProtoTimeEvents(as []trace.Annotation, es []trace.MessageEvent) *tracepb.Span_TimeEvents { - if len(as) == 0 && len(es) == 0 { - return nil - } - - timeEvents := &tracepb.Span_TimeEvents{} - var annotations, droppedAnnotationsCount int - var messageEvents, droppedMessageEventsCount int - - // Transform annotations - for i, a := range as { - if annotations >= maxAnnotationEventsPerSpan { - droppedAnnotationsCount = len(as) - i - break - } - annotations++ - timeEvents.TimeEvent = append(timeEvents.TimeEvent, - &tracepb.Span_TimeEvent{ - Time: timeToTimestamp(a.Time), - Value: transformAnnotationToTimeEvent(&a), - }, - ) - } - - // Transform message events - for i, e := range es { - if messageEvents >= maxMessageEventsPerSpan { - droppedMessageEventsCount = len(es) - i - break - } - messageEvents++ - timeEvents.TimeEvent = append(timeEvents.TimeEvent, - &tracepb.Span_TimeEvent{ - Time: timeToTimestamp(e.Time), - Value: transformMessageEventToTimeEvent(&e), - }, - ) - } - - // Process dropped counter - timeEvents.DroppedAnnotationsCount = clip32(droppedAnnotationsCount) - timeEvents.DroppedMessageEventsCount = clip32(droppedMessageEventsCount) - - return timeEvents -} - -func transformAnnotationToTimeEvent(a *trace.Annotation) *tracepb.Span_TimeEvent_Annotation_ { - return &tracepb.Span_TimeEvent_Annotation_{ - Annotation: &tracepb.Span_TimeEvent_Annotation{ - Description: &tracepb.TruncatableString{Value: a.Message}, - Attributes: ocAttributesToProtoAttributes(a.Attributes), - }, - } -} - -func transformMessageEventToTimeEvent(e *trace.MessageEvent) *tracepb.Span_TimeEvent_MessageEvent_ { - return &tracepb.Span_TimeEvent_MessageEvent_{ - MessageEvent: &tracepb.Span_TimeEvent_MessageEvent{ - Type: tracepb.Span_TimeEvent_MessageEvent_Type(e.EventType), - Id: uint64(e.MessageID), - UncompressedSize: uint64(e.UncompressedByteSize), - CompressedSize: uint64(e.CompressedByteSize), - }, - } -} - -// clip32 clips an int to the range of an int32. -func clip32(x int) int32 { - if x < math.MinInt32 { - return math.MinInt32 - } - if x > math.MaxInt32 { - return math.MaxInt32 - } - return int32(x) -} - -func timeToTimestamp(t time.Time) *timestamp.Timestamp { - nanoTime := t.UnixNano() - return ×tamp.Timestamp{ - Seconds: nanoTime / 1e9, - Nanos: int32(nanoTime % 1e9), - } -} - -func ocSpanKindToProtoSpanKind(kind int) tracepb.Span_SpanKind { - switch kind { - case trace.SpanKindClient: - return tracepb.Span_CLIENT - case trace.SpanKindServer: - return tracepb.Span_SERVER - default: - return tracepb.Span_SPAN_KIND_UNSPECIFIED - } -} - -func ocTracestateToProtoTracestate(ts *tracestate.Tracestate) *tracepb.Span_Tracestate { - if ts == nil { - return nil - } - return &tracepb.Span_Tracestate{ - Entries: ocTracestateEntriesToProtoTracestateEntries(ts.Entries()), - } -} - -func ocTracestateEntriesToProtoTracestateEntries(entries []tracestate.Entry) []*tracepb.Span_Tracestate_Entry { - protoEntries := make([]*tracepb.Span_Tracestate_Entry, 0, len(entries)) - for _, entry := range entries { - protoEntries = append(protoEntries, &tracepb.Span_Tracestate_Entry{ - Key: entry.Key, - Value: entry.Value, - }) - } - return protoEntries -} diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_stats_to_metrics.go b/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_stats_to_metrics.go deleted file mode 100644 index 43f18dec1938..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/transform_stats_to_metrics.go +++ /dev/null @@ -1,274 +0,0 @@ -// Copyright 2018, OpenCensus Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ocagent - -import ( - "errors" - "time" - - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" - - "github.com/golang/protobuf/ptypes/timestamp" - - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" -) - -var ( - errNilMeasure = errors.New("expecting a non-nil stats.Measure") - errNilView = errors.New("expecting a non-nil view.View") - errNilViewData = errors.New("expecting a non-nil view.Data") -) - -func viewDataToMetric(vd *view.Data) (*metricspb.Metric, error) { - if vd == nil { - return nil, errNilViewData - } - - descriptor, err := viewToMetricDescriptor(vd.View) - if err != nil { - return nil, err - } - - timeseries, err := viewDataToTimeseries(vd) - if err != nil { - return nil, err - } - - metric := &metricspb.Metric{ - MetricDescriptor: descriptor, - Timeseries: timeseries, - } - return metric, nil -} - -func viewToMetricDescriptor(v *view.View) (*metricspb.MetricDescriptor, error) { - if v == nil { - return nil, errNilView - } - if v.Measure == nil { - return nil, errNilMeasure - } - - desc := &metricspb.MetricDescriptor{ - Name: stringOrCall(v.Name, v.Measure.Name), - Description: stringOrCall(v.Description, v.Measure.Description), - Unit: v.Measure.Unit(), - Type: aggregationToMetricDescriptorType(v), - LabelKeys: tagKeysToLabelKeys(v.TagKeys), - } - return desc, nil -} - -func stringOrCall(first string, call func() string) string { - if first != "" { - return first - } - return call() -} - -type measureType uint - -const ( - measureUnknown measureType = iota - measureInt64 - measureFloat64 -) - -func measureTypeFromMeasure(m stats.Measure) measureType { - switch m.(type) { - default: - return measureUnknown - case *stats.Float64Measure: - return measureFloat64 - case *stats.Int64Measure: - return measureInt64 - } -} - -func aggregationToMetricDescriptorType(v *view.View) metricspb.MetricDescriptor_Type { - if v == nil || v.Aggregation == nil { - return metricspb.MetricDescriptor_UNSPECIFIED - } - if v.Measure == nil { - return metricspb.MetricDescriptor_UNSPECIFIED - } - - switch v.Aggregation.Type { - case view.AggTypeCount: - // Cumulative on int64 - return metricspb.MetricDescriptor_CUMULATIVE_INT64 - - case view.AggTypeDistribution: - // Cumulative types - return metricspb.MetricDescriptor_CUMULATIVE_DISTRIBUTION - - case view.AggTypeLastValue: - // Gauge types - switch measureTypeFromMeasure(v.Measure) { - case measureFloat64: - return metricspb.MetricDescriptor_GAUGE_DOUBLE - case measureInt64: - return metricspb.MetricDescriptor_GAUGE_INT64 - } - - case view.AggTypeSum: - // Cumulative types - switch measureTypeFromMeasure(v.Measure) { - case measureFloat64: - return metricspb.MetricDescriptor_CUMULATIVE_DOUBLE - case measureInt64: - return metricspb.MetricDescriptor_CUMULATIVE_INT64 - } - } - - // For all other cases, return unspecified. - return metricspb.MetricDescriptor_UNSPECIFIED -} - -func tagKeysToLabelKeys(tagKeys []tag.Key) []*metricspb.LabelKey { - labelKeys := make([]*metricspb.LabelKey, 0, len(tagKeys)) - for _, tagKey := range tagKeys { - labelKeys = append(labelKeys, &metricspb.LabelKey{ - Key: tagKey.Name(), - }) - } - return labelKeys -} - -func viewDataToTimeseries(vd *view.Data) ([]*metricspb.TimeSeries, error) { - if vd == nil || len(vd.Rows) == 0 { - return nil, nil - } - - // Given that view.Data only contains Start, End - // the timestamps for all the row data will be the exact same - // per aggregation. However, the values will differ. - // Each row has its own tags. - startTimestamp := timeToProtoTimestamp(vd.Start) - endTimestamp := timeToProtoTimestamp(vd.End) - - mType := measureTypeFromMeasure(vd.View.Measure) - timeseries := make([]*metricspb.TimeSeries, 0, len(vd.Rows)) - // It is imperative that the ordering of "LabelValues" matches those - // of the Label keys in the metric descriptor. - for _, row := range vd.Rows { - labelValues := labelValuesFromTags(row.Tags) - point := rowToPoint(vd.View, row, endTimestamp, mType) - timeseries = append(timeseries, &metricspb.TimeSeries{ - StartTimestamp: startTimestamp, - LabelValues: labelValues, - Points: []*metricspb.Point{point}, - }) - } - - if len(timeseries) == 0 { - return nil, nil - } - - return timeseries, nil -} - -func timeToProtoTimestamp(t time.Time) *timestamp.Timestamp { - unixNano := t.UnixNano() - return ×tamp.Timestamp{ - Seconds: int64(unixNano / 1e9), - Nanos: int32(unixNano % 1e9), - } -} - -func rowToPoint(v *view.View, row *view.Row, endTimestamp *timestamp.Timestamp, mType measureType) *metricspb.Point { - pt := &metricspb.Point{ - Timestamp: endTimestamp, - } - - switch data := row.Data.(type) { - case *view.CountData: - pt.Value = &metricspb.Point_Int64Value{Int64Value: data.Value} - - case *view.DistributionData: - pt.Value = &metricspb.Point_DistributionValue{ - DistributionValue: &metricspb.DistributionValue{ - Count: data.Count, - Sum: float64(data.Count) * data.Mean, // because Mean := Sum/Count - // TODO: Add Exemplar - Buckets: bucketsToProtoBuckets(data.CountPerBucket), - BucketOptions: &metricspb.DistributionValue_BucketOptions{ - Type: &metricspb.DistributionValue_BucketOptions_Explicit_{ - Explicit: &metricspb.DistributionValue_BucketOptions_Explicit{ - Bounds: v.Aggregation.Buckets, - }, - }, - }, - SumOfSquaredDeviation: data.SumOfSquaredDev, - }} - - case *view.LastValueData: - setPointValue(pt, data.Value, mType) - - case *view.SumData: - setPointValue(pt, data.Value, mType) - } - - return pt -} - -// Not returning anything from this function because metricspb.Point.is_Value is an unexported -// interface hence we just have to set its value by pointer. -func setPointValue(pt *metricspb.Point, value float64, mType measureType) { - if mType == measureInt64 { - pt.Value = &metricspb.Point_Int64Value{Int64Value: int64(value)} - } else { - pt.Value = &metricspb.Point_DoubleValue{DoubleValue: value} - } -} - -func bucketsToProtoBuckets(countPerBucket []int64) []*metricspb.DistributionValue_Bucket { - distBuckets := make([]*metricspb.DistributionValue_Bucket, len(countPerBucket)) - for i := 0; i < len(countPerBucket); i++ { - count := countPerBucket[i] - - distBuckets[i] = &metricspb.DistributionValue_Bucket{ - Count: count, - } - } - - return distBuckets -} - -func labelValuesFromTags(tags []tag.Tag) []*metricspb.LabelValue { - if len(tags) == 0 { - return nil - } - - labelValues := make([]*metricspb.LabelValue, 0, len(tags)) - for _, tag_ := range tags { - labelValues = append(labelValues, &metricspb.LabelValue{ - Value: tag_.Value, - - // It is imperative that we set the "HasValue" attribute, - // in order to distinguish missing a label from the empty string. - // https://godoc.org/github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1#LabelValue.HasValue - // - // OpenCensus-Go uses non-pointers for tags as seen by this function's arguments, - // so the best case that we can use to distinguish missing labels/tags from the - // empty string is by checking if the Tag.Key.Name() != "" to indicate that we have - // a value. - HasValue: tag_.Key.Name() != "", - }) - } - return labelValues -} diff --git a/vendor/contrib.go.opencensus.io/exporter/ocagent/version.go b/vendor/contrib.go.opencensus.io/exporter/ocagent/version.go deleted file mode 100644 index 68be4c75bde7..000000000000 --- a/vendor/contrib.go.opencensus.io/exporter/ocagent/version.go +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2018, OpenCensus Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ocagent - -const Version = "0.0.1" diff --git a/vendor/github.com/Azure/azure-amqp-common-go/v3/.gitignore b/vendor/github.com/Azure/azure-amqp-common-go/v3/.gitignore new file mode 100644 index 000000000000..c805fdabe459 --- /dev/null +++ b/vendor/github.com/Azure/azure-amqp-common-go/v3/.gitignore @@ -0,0 +1,19 @@ +# Binaries for programs and plugins +*.exe +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 +.glide/ + +vendor +.idea + +.DS_Store diff --git a/vendor/github.com/Azure/azure-amqp-common-go/v3/.travis.yml b/vendor/github.com/Azure/azure-amqp-common-go/v3/.travis.yml new file mode 100644 index 000000000000..bb9bfb18a8af --- /dev/null +++ b/vendor/github.com/Azure/azure-amqp-common-go/v3/.travis.yml @@ -0,0 +1,20 @@ +language: go +sudo: false +go: + - 1.x + - 1.11.x + +matrix: + fast_finish: true + +before_install: + - cd ${TRAVIS_HOME} + - go get github.com/mattn/goveralls + - go get golang.org/x/tools/cmd/cover + - go get github.com/fzipp/gocyclo + - go get golang.org/x/lint/golint + - cd ${TRAVIS_BUILD_DIR} + +script: + - export GO111MODULE=on + - make test \ No newline at end of file diff --git a/vendor/github.com/Azure/azure-event-hubs-go/v3/.gitignore b/vendor/github.com/Azure/azure-event-hubs-go/v3/.gitignore new file mode 100644 index 000000000000..8d18833bfb51 --- /dev/null +++ b/vendor/github.com/Azure/azure-event-hubs-go/v3/.gitignore @@ -0,0 +1,29 @@ +# Binaries for programs and plugins +*.exe +*.dll +*.so +*.dylib + +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 +.glide/ + +vendor +.idea + +.DS_Store + +.env + +# Test Infrastructure +terraform.tfvars +*.auto.tfvars +*.tfstate +*.tfstate.backup +.terraform/ +.terraform.tfstate.lock.info \ No newline at end of file diff --git a/vendor/github.com/Azure/azure-event-hubs-go/v3/.travis.yml b/vendor/github.com/Azure/azure-event-hubs-go/v3/.travis.yml new file mode 100644 index 000000000000..7f86919b3c05 --- /dev/null +++ b/vendor/github.com/Azure/azure-event-hubs-go/v3/.travis.yml @@ -0,0 +1,36 @@ +language: go +sudo: false +go: +- 1.x +- 1.11.x +before_install: +- cd ${TRAVIS_HOME} +- export GO111MODULE=auto +- go get -u github.com/mattn/goveralls +- go get -u golang.org/x/tools/cmd/cover +- go get -u github.com/fzipp/gocyclo +- go get -u golang.org/x/lint/golint +- cd ${TRAVIS_BUILD_DIR} +jobs: + include: + - stage: integration tests + if: type IN (push, cron) + env: + - TF_VAR_resource_group_name=eh-travis + - secure: Gytv/BG8PzkBU845teKJdci1RbYzuHn4slhYIQEEZ8r0hvb57YtPD1NUBLWzndj3qrmhJceRkDyKd3gfAIrvLFEp0rD+4E5S2lTjOST4OZRaN8HKKA8dtc1PYlcF1Hr4wA4rx69oKVBncdQYZXE2Sdnx3QwuWnT1G2B3PYvnb1Ess16/4Z4PDZL4Jp2KTubV5nZd70zBJzEkaem4FE/x8pAqKsaNLNuabYRjywzNwcrKqUAYuiy1BaYD/XxKDQ/dNfGEK3gXitNqWqNURghGBlE3e0x++mwIWvW3b8wP+JyvUv3vM6FS7+Rw8qz8XhaG820Sqs8eM4GUxX9BttOOR5KpzbBYH0KgygE3Axo5saktpqImBB0gKi2fNqT7YvdU+peMLIVipsxPHdO0CEgvgFPLIkMdpaXYyjQJWNDDukcRpu+/LVCQRb5Fh8jTS1z8U59sdgW3Ld5YVw6Jt0vO4mNfA799o7yzWlO3a5ZLJotQtXm6WCwOq7IE5m3ObQYbi1YWAlBXuTuHPk4fCSTQJDUkFi4jDSnN4xqlItk+URilyAt+Vs5OuRAztfM/o4/TEjdkXx0T/veZ3eibksdSnYAgHQPCQ6MqeWAk4AKrIJysPQuyPhNo2ye5jh/aozL6VYE9dcft3+RAwp6jQAtP/pv8SpsTkWuC7LnSeJvMa6c= + - secure: eVK61SdkKa+KeIs7iJ0tCWnVlj/BSdc6Yepk42chtRdmikzaXSSvyoRplKJoFutpkSLd0TPIR6GleaXf76RAIarxtSfOuZ5cKtCXQ84W8e+nAdeeOyByYHm75SfJzbbDR5L0pTfeiBfjYndeV176fRRZJprDwRSLQ2NfTYhqaliI1sjVQV2if5fe/oR99UL5Ocvr2ubmXAt3KOk+RZ0WyPQAjRIpIc1VziYZ1uwHVyIqkD7g76yfHy+ENvTVT48jv+3HpC120h7aufeirsbo1zBYrIdIE/Y02ISdUWWc+uXn1qbQnpwOtyjksUNVvzQyBicI8FGKhQSxMzkLZyvBXon7Pbkr6BVmSXX916QyvigqAeDDHIBkbHO/oNaKgtxBHiM2yymfYG9HkUzM/bKIA7+g2eVGHiPPn7tk5Ytgf10Q7ZPH1epvhaHnQduw2sDVWybOfw9h+hwgkUYWBsyo7xlvwM5eyCX7Nntg6K2vu8fCiSNAPlZLhex89H8DBb2BlhXQDEGX7QTRo+SYuY/JKhW9HeWiDcRLPxGEeTkh4ZrLdjZeKpFF9Bcuxqk3iaD3+CsCnqI/542Y2HT5zw7qCMbXZYwaXW90VYFysuOh1pgRoZ5kwSyH1mD/o+xLXfuV0AJlzyraZZes/83TsKF611AlynPbEQD5BGv/Noo9JAE= + - secure: ja4Qu9OkHPzpGTSbsMf7WyBT5b1uYtdfLH7ehCzsPXUBbOqsJw1f4Nzgmzh0xvNMbL2AlOGqWwU6HJXb3Cn3ehTTsaiQz6BrBW6A1OmNOuup6m2nQ8BeuFD8lPTj6DcHTEldIn6aOP5ZcIp5OnUxIluxj4Nh3BR495L+YF3X07VCgH4G+RwcSiRMorrDinkwHjDozHZcMaQJ7HD/TYW6uaqcWzmJTaFFlUK2pMPvh9jgQ5L+xQwpi09t2J5mPcSL2HptlSkSnNISzYp3qT33dNGJcj+4zM7NGsYSCBDII6G/wOIdNhNKFb4lKSXUdg/5uWDESAkKK9vveDGwdPVGZXXx16fcQ2QTsQbTSLBfGT4nTYadiNvSJgUSLykZitg4RppdYHHBiQu7UYUk03KpbSJjQct4Lqbnhw9uLEk68rXzis/MayOuGpL1bimB3+13h3/QoXEaHOGiOVsE9/UUYmpYQZYbdnkzBiEF7oPkoxTNjuzdYt2SQLvQeOah4qkHy3oH83c8EcU+aPMEWCc3yTkqY75VATyIa/TP3rySAFcogq/Kd4aDUWwcxO4u1B2TD8UNE5YqftWo97Heo6lE+kAr1FfhxS6cwuWMTfQ5KwgFv+Qlgb71zlP3T/Yn5kPdGY0kwoqiEmq5hjcjOHLLYYvBsYPfAmtQMKSe2fFZ53Q= + - secure: SPYzI+Fyzbf0blXoX7vSCWcgPfTQnkNy1jSNps68a0dy1yE3WAc/AEgV4wcwgFjV7WkMIX9ik0q5ggbiVgMw1nQA4U6K8n7yJsqI+s0GGEdE1Y1HBCWIMJw1JazTHI2qRg69UiVj2xI1LPvTFGgxClGnZoPCh9dxlMPO6M2f90mJUKVNxkjuLe1BWnLyzyGZnhB/EEam39ijOVnkfXdwcN4nGUjMsEwi5rOQLeZsymgKqN2aMeXtZltTeertO4ob8K2hGinNHjkYzjyFSCZvGaubnVr22F777YDCvh0cq7CTRQiMm1KiHT9QZ/0JbvsfC+0TPl0lXnLx6NnMvlKL5sA6xpFcarO4nGB4jON5SnVPF+3VW0BSyfypFHAn/fSSmftqg8TI7uSGuOJauG2ld/1e1v9WPkY56frC2ULVWt7eZFOpIm9JoosCjKgwQjx320VwJgKW8xJ4ynAPqFVVlZCdQEs+NJGOOJi1NkDpd++QolgKFkPdkBNFmVYRPdVe/iRzaipZ2WOX94sg+5CfA5TcZTz2fvDJHyNgqEkVUS9VHWDB75nkJ8vq1b8G9+wM/ulAsdepjaPlatd0pGeVJzt1IwJFDUgddCEXHub0HXuJk2kE7V/i1h0E4kcfQq8HFEJaG1tsWe2kA+OBX58pCZWXmDB2KshGWW9tlWzwRlo= + script: + - curl -sLo /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.12.8/terraform_0.12.8_linux_amd64.zip + - unzip /tmp/terraform.zip -d /tmp + - mkdir -p ~/bin + - mv /tmp/terraform ~/bin + - export PATH="~/bin:$PATH" + - export GO111MODULE=on + - make test-cover + - goveralls -coverprofile=cover.out -service=travis-ci + - make destroy +script: +- export GO111MODULE=on +- make diff --git a/vendor/github.com/Azure/azure-event-hubs-go/v3/changelog.md b/vendor/github.com/Azure/azure-event-hubs-go/v3/changelog.md index 0b92dd381586..2b901924a562 100644 --- a/vendor/github.com/Azure/azure-event-hubs-go/v3/changelog.md +++ b/vendor/github.com/Azure/azure-event-hubs-go/v3/changelog.md @@ -2,6 +2,8 @@ ## `head` +- add support for websocket connections with eph with `eph.WithWebSocketConnection()` + ## `v2.0.4` - add comment on the `PartitionID` field in `SystemProperties` to clarify that it will always return a nil value [#131](https://github.com/Azure/azure-event-hubs-go/issues/131) diff --git a/vendor/github.com/Azure/azure-event-hubs-go/v3/eph/eph.go b/vendor/github.com/Azure/azure-event-hubs-go/v3/eph/eph.go index 1d14df5a12dc..38d05a146e54 100644 --- a/vendor/github.com/Azure/azure-event-hubs-go/v3/eph/eph.go +++ b/vendor/github.com/Azure/azure-event-hubs-go/v3/eph/eph.go @@ -74,6 +74,7 @@ type ( handlersMu sync.Mutex partitionIDs []string noBanner bool + webSocketConnection bool env *azure.Environment } @@ -117,6 +118,14 @@ func WithEnvironment(env azure.Environment) EventProcessorHostOption { } } +// WithWebSocketConnection will configure an EventProcessorHost to use websockets +func WithWebSocketConnection() EventProcessorHostOption { + return func(host *EventProcessorHost) error { + host.webSocketConnection = true + return nil + } +} + // NewFromConnectionString builds a new Event Processor Host from an Event Hub connection string which can be found in // the Azure portal func NewFromConnectionString(ctx context.Context, connStr string, leaser Leaser, checkpointer Checkpointer, opts ...EventProcessorHostOption) (*EventProcessorHost, error) { @@ -165,6 +174,10 @@ func NewFromConnectionString(ctx context.Context, connStr string, leaser Leaser, hubOpts = append(hubOpts, eventhub.HubWithEnvironment(*host.env)) } + if host.webSocketConnection { + hubOpts = append(hubOpts, eventhub.HubWithWebSocketConnection()) + } + client, err := eventhub.NewHubFromConnectionString(connStr, hubOpts...) if err != nil { tab.For(ctx).Error(err) @@ -217,6 +230,10 @@ func New(ctx context.Context, namespace, hubName string, tokenProvider auth.Toke hubOpts = append(hubOpts, eventhub.HubWithEnvironment(*host.env)) } + if host.webSocketConnection { + hubOpts = append(hubOpts, eventhub.HubWithWebSocketConnection()) + } + client, err := eventhub.NewHub(namespace, hubName, tokenProvider, hubOpts...) if err != nil { return nil, err diff --git a/vendor/github.com/Azure/azure-event-hubs-go/v3/version.go b/vendor/github.com/Azure/azure-event-hubs-go/v3/version.go index 81e7ecfb69f1..3c676a70e3fd 100644 --- a/vendor/github.com/Azure/azure-event-hubs-go/v3/version.go +++ b/vendor/github.com/Azure/azure-event-hubs-go/v3/version.go @@ -2,5 +2,5 @@ package eventhub const ( // Version is the semantic version number - Version = "3.0.0" + Version = "3.1.0" ) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go index 33f4f8b2f36a..4dd760880816 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go @@ -67,7 +67,8 @@ func (client ConsumerGroupsClient) CreateOrUpdate(ctx context.Context, resourceG Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: consumerGroupName, Constraints: []validation.Constraint{{Target: "consumerGroupName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "consumerGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { @@ -165,7 +166,8 @@ func (client ConsumerGroupsClient) Delete(ctx context.Context, resourceGroupName Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: consumerGroupName, Constraints: []validation.Constraint{{Target: "consumerGroupName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "consumerGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { @@ -260,7 +262,8 @@ func (client ConsumerGroupsClient) Get(ctx context.Context, resourceGroupName st Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: consumerGroupName, Constraints: []validation.Constraint{{Target: "consumerGroupName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "consumerGroupName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { @@ -360,16 +363,17 @@ func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceG Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: skip, Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil}, - {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}}}, {TargetValue: top, Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil}, - {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: int64(1), Chain: nil}, }}}}}); err != nil { return result, validation.NewError("eventhub.ConsumerGroupsClient", "ListByEventHub", err.Error()) } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go index 8a8b3ac8ef5e..d9b70ccb444a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go @@ -66,21 +66,22 @@ func (client EventHubsClient) CreateOrUpdate(ctx context.Context, resourceGroupN Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: parameters, Constraints: []validation.Constraint{{Target: "parameters.Properties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.MessageRetentionInDays", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.Properties.MessageRetentionInDays", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.Properties.MessageRetentionInDays", Name: validation.InclusiveMinimum, Rule: int64(1), Chain: nil}}}, {Target: "parameters.Properties.PartitionCount", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.Properties.PartitionCount", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.Properties.PartitionCount", Name: validation.InclusiveMinimum, Rule: int64(1), Chain: nil}}}, {Target: "parameters.Properties.CaptureDescription", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMaximum, Rule: int64(900), Chain: nil}, - {Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMinimum, Rule: 60, Chain: nil}, + {Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMinimum, Rule: int64(60), Chain: nil}, }}, {Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMaximum, Rule: int64(524288000), Chain: nil}, - {Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMinimum, Rule: 10485760, Chain: nil}, + {Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMinimum, Rule: int64(10485760), Chain: nil}, }}, }}, }}}}}); err != nil { @@ -178,7 +179,8 @@ func (client EventHubsClient) CreateOrUpdateAuthorizationRule(ctx context.Contex Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: authorizationRuleName, Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: parameters, @@ -277,7 +279,8 @@ func (client EventHubsClient) Delete(ctx context.Context, resourceGroupName stri Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "Delete", err.Error()) } @@ -368,7 +371,8 @@ func (client EventHubsClient) DeleteAuthorizationRule(ctx context.Context, resou Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: authorizationRuleName, Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "DeleteAuthorizationRule", err.Error()) @@ -461,7 +465,8 @@ func (client EventHubsClient) Get(ctx context.Context, resourceGroupName string, Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "Get", err.Error()) } @@ -553,7 +558,8 @@ func (client EventHubsClient) GetAuthorizationRule(ctx context.Context, resource Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: authorizationRuleName, Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "GetAuthorizationRule", err.Error()) @@ -647,7 +653,8 @@ func (client EventHubsClient) ListAuthorizationRules(ctx context.Context, resour Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "ListAuthorizationRules", err.Error()) } @@ -781,12 +788,12 @@ func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroup {TargetValue: skip, Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil}, - {Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + {Target: "skip", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}}}, {TargetValue: top, Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil}, - {Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}, + {Target: "top", Name: validation.InclusiveMinimum, Rule: int64(1), Chain: nil}, }}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "ListByNamespace", err.Error()) } @@ -922,7 +929,8 @@ func (client EventHubsClient) ListKeys(ctx context.Context, resourceGroupName st Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: authorizationRuleName, Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "ListKeys", err.Error()) @@ -1018,7 +1026,8 @@ func (client EventHubsClient) RegenerateKeys(ctx context.Context, resourceGroupN Constraints: []validation.Constraint{{Target: "namespaceName", Name: validation.MaxLength, Rule: 50, Chain: nil}, {Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}}, {TargetValue: eventHubName, - Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, + Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MaxLength, Rule: 50, Chain: nil}, + {Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}}, {TargetValue: authorizationRuleName, Constraints: []validation.Constraint{{Target: "authorizationRuleName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil { return result, validation.NewError("eventhub.EventHubsClient", "RegenerateKeys", err.Error()) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go index 92e4987c2429..919bea875af1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go @@ -151,13 +151,13 @@ func (client NamespacesClient) CreateOrUpdate(ctx context.Context, resourceGroup Constraints: []validation.Constraint{{Target: "parameters.Sku", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMaximum, Rule: int64(20), Chain: nil}, - {Target: "parameters.Sku.Capacity", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + {Target: "parameters.Sku.Capacity", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}, {Target: "parameters.EHNamespaceProperties", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMaximum, Rule: int64(20), Chain: nil}, - {Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}, + {Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}, }}, }}}}}); err != nil { return result, validation.NewError("eventhub.NamespacesClient", "CreateOrUpdate", err.Error()) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights/logprofiles.go b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights/logprofiles.go index 6060395c2df3..e96cea0a6184 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights/logprofiles.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights/logprofiles.go @@ -64,7 +64,7 @@ func (client LogProfilesClient) CreateOrUpdate(ctx context.Context, logProfileNa {Target: "parameters.LogProfileProperties.RetentionPolicy", Name: validation.Null, Rule: true, Chain: []validation.Constraint{{Target: "parameters.LogProfileProperties.RetentionPolicy.Enabled", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.LogProfileProperties.RetentionPolicy.Days", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.LogProfileProperties.RetentionPolicy.Days", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil}}}, + Chain: []validation.Constraint{{Target: "parameters.LogProfileProperties.RetentionPolicy.Days", Name: validation.InclusiveMinimum, Rule: int64(0), Chain: nil}}}, }}, }}}}}); err != nil { return result, validation.NewError("insights.LogProfilesClient", "CreateOrUpdate", err.Error()) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/deployments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/deployments.go index 47edc33ed436..b65dff16bbd3 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/deployments.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/deployments.go @@ -41,6 +41,78 @@ func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) Depl return DeploymentsClient{NewWithBaseURI(baseURI, subscriptionID)} } +// CalculateTemplateHash calculate the hash of the given template. +// Parameters: +// templateParameter - the template provided to calculate hash. +func (client DeploymentsClient) CalculateTemplateHash(ctx context.Context, templateParameter interface{}) (result TemplateHashResult, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/DeploymentsClient.CalculateTemplateHash") + defer func() { + sc := -1 + if result.Response.Response != nil { + sc = result.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + req, err := client.CalculateTemplateHashPreparer(ctx, templateParameter) + if err != nil { + err = autorest.NewErrorWithError(err, "resources.DeploymentsClient", "CalculateTemplateHash", nil, "Failure preparing request") + return + } + + resp, err := client.CalculateTemplateHashSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "resources.DeploymentsClient", "CalculateTemplateHash", resp, "Failure sending request") + return + } + + result, err = client.CalculateTemplateHashResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "resources.DeploymentsClient", "CalculateTemplateHash", resp, "Failure responding to request") + } + + return +} + +// CalculateTemplateHashPreparer prepares the CalculateTemplateHash request. +func (client DeploymentsClient) CalculateTemplateHashPreparer(ctx context.Context, templateParameter interface{}) (*http.Request, error) { + const APIVersion = "2019-03-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + + preparer := autorest.CreatePreparer( + autorest.AsContentType("application/json; charset=utf-8"), + autorest.AsPost(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPath("/providers/Microsoft.Resources/calculateTemplateHash"), + autorest.WithJSON(templateParameter), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// CalculateTemplateHashSender sends the CalculateTemplateHash request. The method will close the +// http.Response Body if it receives an error. +func (client DeploymentsClient) CalculateTemplateHashSender(req *http.Request) (*http.Response, error) { + sd := autorest.GetSendDecorators(req.Context(), autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + return autorest.SendWithSender(client, req, sd...) +} + +// CalculateTemplateHashResponder handles the response to the CalculateTemplateHash request. The method always +// closes the http.Response Body. +func (client DeploymentsClient) CalculateTemplateHashResponder(resp *http.Response) (result TemplateHashResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + // Cancel you can cancel a deployment only if the provisioningState is Accepted or Running. After the deployment is // canceled, the provisioningState is set to Canceled. Canceling a template deployment stops the currently running // template deployment and leaves the resource group partially deployed. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/models.go index 194aabca5a8a..5a354d589684 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources/models.go @@ -106,6 +106,11 @@ type BasicDependency struct { ResourceName *string `json:"resourceName,omitempty"` } +// CloudError an error response for a resource management request. +type CloudError struct { + Error *ErrorResponse `json:"error,omitempty"` +} + // CreateOrUpdateByIDFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type CreateOrUpdateByIDFuture struct { @@ -747,6 +752,28 @@ type DeploymentValidateResult struct { Properties *DeploymentPropertiesExtended `json:"properties,omitempty"` } +// ErrorAdditionalInfo the resource management error additional info. +type ErrorAdditionalInfo struct { + // Type - READ-ONLY; The additional info type. + Type *string `json:"type,omitempty"` + // Info - READ-ONLY; The additional info. + Info interface{} `json:"info,omitempty"` +} + +// ErrorResponse the resource management error response. +type ErrorResponse struct { + // Code - READ-ONLY; The error code. + Code *string `json:"code,omitempty"` + // Message - READ-ONLY; The error message. + Message *string `json:"message,omitempty"` + // Target - READ-ONLY; The error target. + Target *string `json:"target,omitempty"` + // Details - READ-ONLY; The error details. + Details *[]ErrorResponse `json:"details,omitempty"` + // AdditionalInfo - READ-ONLY; The error additional info. + AdditionalInfo *[]ErrorAdditionalInfo `json:"additionalInfo,omitempty"` +} + // ExportTemplateRequest export resource group template request parameters. type ExportTemplateRequest struct { // ResourcesProperty - The IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'. @@ -1963,6 +1990,16 @@ type TargetResource struct { ResourceType *string `json:"resourceType,omitempty"` } +// TemplateHashResult result of the request to calculate template hash. It contains a string of minified +// template and its hash. +type TemplateHashResult struct { + autorest.Response `json:"-"` + // MinifiedTemplate - The minified template string. + MinifiedTemplate *string `json:"minifiedTemplate,omitempty"` + // TemplateHash - The template hash. + TemplateHash *string `json:"templateHash,omitempty"` +} + // TemplateLink entity representing the reference to the template. type TemplateLink struct { // URI - The URI of the template to deploy. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go index 1fc8748fa479..672e7e77a9bd 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/version/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/version/version.go @@ -18,4 +18,4 @@ package version // Changes may cause incorrect behavior and will be lost if the code is regenerated. // Number contains the semantic version of this SDK. -const Number = "v32.1.0" +const Number = "v37.1.0" diff --git a/vendor/github.com/Azure/go-amqp/.gitattributes b/vendor/github.com/Azure/go-amqp/.gitattributes new file mode 100644 index 000000000000..854069f01fe5 --- /dev/null +++ b/vendor/github.com/Azure/go-amqp/.gitattributes @@ -0,0 +1,3 @@ +# Binary files (no line-ending conversions), diff using hexdump +*.bin binary diff=hex + diff --git a/vendor/github.com/Azure/go-amqp/.gitignore b/vendor/github.com/Azure/go-amqp/.gitignore new file mode 100644 index 000000000000..d59ea0da9db1 --- /dev/null +++ b/vendor/github.com/Azure/go-amqp/.gitignore @@ -0,0 +1,11 @@ +amqp.test +/fuzz/*/* +!/fuzz/*/corpus +/fuzz/*.zip +*.log +/cmd +cover.out +.envrc +recordings +.vscode +.idea diff --git a/vendor/github.com/Azure/go-amqp/CODE_OF_CONDUCT.md b/vendor/github.com/Azure/go-amqp/CODE_OF_CONDUCT.md index f9ba8cf65f3e..c72a5749c52a 100644 --- a/vendor/github.com/Azure/go-amqp/CODE_OF_CONDUCT.md +++ b/vendor/github.com/Azure/go-amqp/CODE_OF_CONDUCT.md @@ -1,9 +1,9 @@ -# Microsoft Open Source Code of Conduct - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). - -Resources: - -- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/) -- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) -- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns +# Microsoft Open Source Code of Conduct + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). + +Resources: + +- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/) +- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) +- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns diff --git a/vendor/github.com/Azure/go-amqp/LICENSE b/vendor/github.com/Azure/go-amqp/LICENSE index 9e841e7a26e4..3d8b93bc7987 100644 --- a/vendor/github.com/Azure/go-amqp/LICENSE +++ b/vendor/github.com/Azure/go-amqp/LICENSE @@ -1,21 +1,21 @@ - MIT License - - Copyright (c) Microsoft Corporation. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE + MIT License + + Copyright (c) Microsoft Corporation. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE diff --git a/vendor/github.com/Azure/go-amqp/README.md b/vendor/github.com/Azure/go-amqp/README.md index 81884b434653..c50bc2c5b6b1 100644 --- a/vendor/github.com/Azure/go-amqp/README.md +++ b/vendor/github.com/Azure/go-amqp/README.md @@ -1,144 +1,144 @@ -# **github.com/Azure/go-amqp** - -[![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/go/Azure.go-amqp?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=1292&branchName=master) -[![Go Report Card](https://goreportcard.com/badge/github.com/Azure/go-amqp)](https://goreportcard.com/report/github.com/Azure/go-amqp) -[![GoDoc](https://godoc.org/github.com/Azure/go-amqp?status.svg)](http://godoc.org/github.com/Azure/go-amqp) -[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Azure/go-amqp/master/LICENSE) - -github.com/Azure/go-amqp is an AMQP 1.0 client implementation for Go. - -[AMQP 1.0](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-overview-v1.0-os.html) is not compatible with AMQP 0-9-1 or 0-10, which are -the most common AMQP protocols in use today. A list of AMQP 1.0 brokers and other -AMQP 1.0 resources can be found at [github.com/xinchen10/awesome-amqp](https://github.com/xinchen10/awesome-amqp). - -This library aims to be stable and worthy of production usage, but the API is still subject to change. To conform with SemVer, the major version will remain 0 until the API is deemed stable. During this period breaking changes will be indicated by bumping the minor version. Non-breaking changes will bump the patch version. - -## Install - -``` -go get -u github.com/Azure/go-amqp -``` - -## Contributing - -Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md). - -## Example Usage - -``` go -package main - -import ( - "context" - "fmt" - "log" - "time" - - "github.com/Azure/go-amqp" -) - -func main() { - // Create client - client, err := amqp.Dial("amqps://my-namespace.servicebus.windows.net", - amqp.ConnSASLPlain("access-key-name", "access-key"), - ) - if err != nil { - log.Fatal("Dialing AMQP server:", err) - } - defer client.Close() - - // Open a session - session, err := client.NewSession() - if err != nil { - log.Fatal("Creating AMQP session:", err) - } - - ctx := context.Background() - - // Send a message - { - // Create a sender - sender, err := session.NewSender( - amqp.LinkTargetAddress("/queue-name"), - ) - if err != nil { - log.Fatal("Creating sender link:", err) - } - - ctx, cancel := context.WithTimeout(ctx, 5*time.Second) - - // Send message - err = sender.Send(ctx, amqp.NewMessage([]byte("Hello!"))) - if err != nil { - log.Fatal("Sending message:", err) - } - - sender.Close(ctx) - cancel() - } - - // Continuously read messages - { - // Create a receiver - receiver, err := session.NewReceiver( - amqp.LinkSourceAddress("/queue-name"), - amqp.LinkCredit(10), - ) - if err != nil { - log.Fatal("Creating receiver link:", err) - } - defer func() { - ctx, cancel := context.WithTimeout(ctx, 1*time.Second) - receiver.Close(ctx) - cancel() - }() - - for { - // Receive next message - msg, err := receiver.Receive(ctx) - if err != nil { - log.Fatal("Reading message from AMQP:", err) - } - - // Accept message - msg.Accept() - - fmt.Printf("Message received: %s\n", msg.GetData()) - } - } -} -``` - -## Related Projects - -| Project | Description | -|---------|-------------| -| [github.com/Azure/azure-event-hubs-go](https://github.com/Azure/azure-event-hubs-go) * | Library for interacting with Microsoft Azure Event Hubs. | -| [github.com/Azure/azure-service-bus-go](https://github.com/Azure/azure-service-bus-go) * | Library for interacting with Microsoft Azure Service Bus. | -| [gocloud.dev/pubsub](https://gocloud.dev/pubsub) * | Library for portably interacting with Pub/Sub systems. | -| [qpid-proton](https://github.com/apache/qpid-proton/tree/go1) | AMQP 1.0 library using the Qpid Proton C bindings. | - -`*` indicates that the project uses this library. - -Feel free to send PRs adding additional projects. Listed projects are not limited to those that use this library as long as they are potentially useful to people who are looking at an AMQP library. - -### Other Notes - -By default, this package depends only on the standard library. Building with the -`pkgerrors` tag will cause errors to be created/wrapped by the github.com/pkg/errors -library. This can be useful for debugging and when used in a project using -github.com/pkg/errors. - -# Contributing - -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. - -When you submit a pull request, a CLA bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. +# **github.com/Azure/go-amqp** + +[![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/go/Azure.go-amqp?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=1292&branchName=master) +[![Go Report Card](https://goreportcard.com/badge/github.com/Azure/go-amqp)](https://goreportcard.com/report/github.com/Azure/go-amqp) +[![GoDoc](https://godoc.org/github.com/Azure/go-amqp?status.svg)](http://godoc.org/github.com/Azure/go-amqp) +[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Azure/go-amqp/master/LICENSE) + +github.com/Azure/go-amqp is an AMQP 1.0 client implementation for Go. + +[AMQP 1.0](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-overview-v1.0-os.html) is not compatible with AMQP 0-9-1 or 0-10, which are +the most common AMQP protocols in use today. A list of AMQP 1.0 brokers and other +AMQP 1.0 resources can be found at [github.com/xinchen10/awesome-amqp](https://github.com/xinchen10/awesome-amqp). + +This library aims to be stable and worthy of production usage, but the API is still subject to change. To conform with SemVer, the major version will remain 0 until the API is deemed stable. During this period breaking changes will be indicated by bumping the minor version. Non-breaking changes will bump the patch version. + +## Install + +``` +go get -u github.com/Azure/go-amqp +``` + +## Contributing + +Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md). + +## Example Usage + +``` go +package main + +import ( + "context" + "fmt" + "log" + "time" + + "github.com/Azure/go-amqp" +) + +func main() { + // Create client + client, err := amqp.Dial("amqps://my-namespace.servicebus.windows.net", + amqp.ConnSASLPlain("access-key-name", "access-key"), + ) + if err != nil { + log.Fatal("Dialing AMQP server:", err) + } + defer client.Close() + + // Open a session + session, err := client.NewSession() + if err != nil { + log.Fatal("Creating AMQP session:", err) + } + + ctx := context.Background() + + // Send a message + { + // Create a sender + sender, err := session.NewSender( + amqp.LinkTargetAddress("/queue-name"), + ) + if err != nil { + log.Fatal("Creating sender link:", err) + } + + ctx, cancel := context.WithTimeout(ctx, 5*time.Second) + + // Send message + err = sender.Send(ctx, amqp.NewMessage([]byte("Hello!"))) + if err != nil { + log.Fatal("Sending message:", err) + } + + sender.Close(ctx) + cancel() + } + + // Continuously read messages + { + // Create a receiver + receiver, err := session.NewReceiver( + amqp.LinkSourceAddress("/queue-name"), + amqp.LinkCredit(10), + ) + if err != nil { + log.Fatal("Creating receiver link:", err) + } + defer func() { + ctx, cancel := context.WithTimeout(ctx, 1*time.Second) + receiver.Close(ctx) + cancel() + }() + + for { + // Receive next message + msg, err := receiver.Receive(ctx) + if err != nil { + log.Fatal("Reading message from AMQP:", err) + } + + // Accept message + msg.Accept() + + fmt.Printf("Message received: %s\n", msg.GetData()) + } + } +} +``` + +## Related Projects + +| Project | Description | +|---------|-------------| +| [github.com/Azure/azure-event-hubs-go](https://github.com/Azure/azure-event-hubs-go) * | Library for interacting with Microsoft Azure Event Hubs. | +| [github.com/Azure/azure-service-bus-go](https://github.com/Azure/azure-service-bus-go) * | Library for interacting with Microsoft Azure Service Bus. | +| [gocloud.dev/pubsub](https://gocloud.dev/pubsub) * | Library for portably interacting with Pub/Sub systems. | +| [qpid-proton](https://github.com/apache/qpid-proton/tree/go1) | AMQP 1.0 library using the Qpid Proton C bindings. | + +`*` indicates that the project uses this library. + +Feel free to send PRs adding additional projects. Listed projects are not limited to those that use this library as long as they are potentially useful to people who are looking at an AMQP library. + +### Other Notes + +By default, this package depends only on the standard library. Building with the +`pkgerrors` tag will cause errors to be created/wrapped by the github.com/pkg/errors +library. This can be useful for debugging and when used in a project using +github.com/pkg/errors. + +# Contributing + +This project welcomes contributions and suggestions. Most contributions require you to agree to a +Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us +the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. + +When you submit a pull request, a CLA bot will automatically determine whether you need to provide +a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions +provided by the bot. You will only need to do this once across all repos using our CLA. + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). +For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or +contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. diff --git a/vendor/github.com/Azure/go-amqp/SECURITY.md b/vendor/github.com/Azure/go-amqp/SECURITY.md index e0dfff56a956..7ab49eb82964 100644 --- a/vendor/github.com/Azure/go-amqp/SECURITY.md +++ b/vendor/github.com/Azure/go-amqp/SECURITY.md @@ -1,41 +1,41 @@ - - -## Security - -Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). - -If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below. - -## Reporting Security Issues - -**Please do not report security vulnerabilities through public GitHub issues.** - -Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report). - -If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc). - -You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). - -Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: - - * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) - * Full paths of source file(s) related to the manifestation of the issue - * The location of the affected source code (tag/branch/commit or direct URL) - * Any special configuration required to reproduce the issue - * Step-by-step instructions to reproduce the issue - * Proof-of-concept or exploit code (if possible) - * Impact of the issue, including how an attacker might exploit the issue - -This information will help us triage your report more quickly. - -If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs. - -## Preferred Languages - -We prefer all communications to be in English. - -## Policy - -Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd). - - + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd). + + diff --git a/vendor/github.com/Azure/go-autorest/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/LICENSE similarity index 100% rename from vendor/github.com/Azure/go-autorest/LICENSE rename to vendor/github.com/Azure/go-autorest/autorest/LICENSE diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/adal/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/devicetoken.go b/vendor/github.com/Azure/go-autorest/autorest/adal/devicetoken.go index b38f4c245897..914f8af5e4ea 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/devicetoken.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/devicetoken.go @@ -24,6 +24,7 @@ package adal */ import ( + "context" "encoding/json" "fmt" "io/ioutil" @@ -101,7 +102,14 @@ type deviceToken struct { // InitiateDeviceAuth initiates a device auth flow. It returns a DeviceCode // that can be used with CheckForUserCompletion or WaitForUserCompletion. +// Deprecated: use InitiateDeviceAuthWithContext() instead. func InitiateDeviceAuth(sender Sender, oauthConfig OAuthConfig, clientID, resource string) (*DeviceCode, error) { + return InitiateDeviceAuthWithContext(context.Background(), sender, oauthConfig, clientID, resource) +} + +// InitiateDeviceAuthWithContext initiates a device auth flow. It returns a DeviceCode +// that can be used with CheckForUserCompletion or WaitForUserCompletion. +func InitiateDeviceAuthWithContext(ctx context.Context, sender Sender, oauthConfig OAuthConfig, clientID, resource string) (*DeviceCode, error) { v := url.Values{ "client_id": []string{clientID}, "resource": []string{resource}, @@ -117,7 +125,7 @@ func InitiateDeviceAuth(sender Sender, oauthConfig OAuthConfig, clientID, resour req.ContentLength = int64(len(s)) req.Header.Set(contentType, mimeTypeFormPost) - resp, err := sender.Do(req) + resp, err := sender.Do(req.WithContext(ctx)) if err != nil { return nil, fmt.Errorf("%s %s: %s", logPrefix, errCodeSendingFails, err.Error()) } @@ -151,7 +159,14 @@ func InitiateDeviceAuth(sender Sender, oauthConfig OAuthConfig, clientID, resour // CheckForUserCompletion takes a DeviceCode and checks with the Azure AD OAuth endpoint // to see if the device flow has: been completed, timed out, or otherwise failed +// Deprecated: use CheckForUserCompletionWithContext() instead. func CheckForUserCompletion(sender Sender, code *DeviceCode) (*Token, error) { + return CheckForUserCompletionWithContext(context.Background(), sender, code) +} + +// CheckForUserCompletionWithContext takes a DeviceCode and checks with the Azure AD OAuth endpoint +// to see if the device flow has: been completed, timed out, or otherwise failed +func CheckForUserCompletionWithContext(ctx context.Context, sender Sender, code *DeviceCode) (*Token, error) { v := url.Values{ "client_id": []string{code.ClientID}, "code": []string{*code.DeviceCode}, @@ -169,7 +184,7 @@ func CheckForUserCompletion(sender Sender, code *DeviceCode) (*Token, error) { req.ContentLength = int64(len(s)) req.Header.Set(contentType, mimeTypeFormPost) - resp, err := sender.Do(req) + resp, err := sender.Do(req.WithContext(ctx)) if err != nil { return nil, fmt.Errorf("%s %s: %s", logPrefix, errTokenSendingFails, err.Error()) } @@ -213,12 +228,19 @@ func CheckForUserCompletion(sender Sender, code *DeviceCode) (*Token, error) { // WaitForUserCompletion calls CheckForUserCompletion repeatedly until a token is granted or an error state occurs. // This prevents the user from looping and checking against 'ErrDeviceAuthorizationPending'. +// Deprecated: use WaitForUserCompletionWithContext() instead. func WaitForUserCompletion(sender Sender, code *DeviceCode) (*Token, error) { + return WaitForUserCompletionWithContext(context.Background(), sender, code) +} + +// WaitForUserCompletionWithContext calls CheckForUserCompletion repeatedly until a token is granted or an error +// state occurs. This prevents the user from looping and checking against 'ErrDeviceAuthorizationPending'. +func WaitForUserCompletionWithContext(ctx context.Context, sender Sender, code *DeviceCode) (*Token, error) { intervalDuration := time.Duration(*code.Interval) * time.Second waitDuration := intervalDuration for { - token, err := CheckForUserCompletion(sender, code) + token, err := CheckForUserCompletionWithContext(ctx, sender, code) if err == nil { return token, nil @@ -237,6 +259,11 @@ func WaitForUserCompletion(sender Sender, code *DeviceCode) (*Token, error) { return nil, fmt.Errorf("%s Error waiting for user to complete device flow. Server told us to slow_down too much", logPrefix) } - time.Sleep(waitDuration) + select { + case <-time.After(waitDuration): + // noop + case <-ctx.Done(): + return nil, ctx.Err() + } } } diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/go.mod b/vendor/github.com/Azure/go-autorest/autorest/adal/go.mod index 5c95dbfea4b9..a030eb42da8b 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/go.mod @@ -3,9 +3,10 @@ module github.com/Azure/go-autorest/autorest/adal go 1.12 require ( - github.com/Azure/go-autorest/autorest/date v0.1.0 - github.com/Azure/go-autorest/autorest/mocks v0.1.0 - github.com/Azure/go-autorest/tracing v0.1.0 + github.com/Azure/go-autorest/autorest v0.9.0 + github.com/Azure/go-autorest/autorest/date v0.2.0 + github.com/Azure/go-autorest/autorest/mocks v0.3.0 + github.com/Azure/go-autorest/tracing v0.5.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 ) diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/go.sum b/vendor/github.com/Azure/go-autorest/autorest/adal/go.sum index ef9d101618fc..e43cf6498d0d 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/go.sum +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/go.sum @@ -1,139 +1,28 @@ -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= -contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc= -contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/mocks v0.1.0 h1:Kx+AUU2Te+A3JIyYn6Dfs+cFgx5XorQKuIXrZGoq/SI= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/tracing v0.1.0 h1:TRBxC5Pj/fIuh4Qob0ZpkggbfT8RC0SubHbpV3p4/Vc= -github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -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-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-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.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.2.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-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -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= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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/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-20180906233101-161cd47e91fd/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-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-20190125091013-d26f9f9a57f3/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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -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/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 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180909124046-d0be0721c37e/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -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= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/adal/go_mod_tidy_hack.go new file mode 100644 index 000000000000..28a4bfc4c437 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package adal + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/sender.go b/vendor/github.com/Azure/go-autorest/autorest/adal/sender.go index 834401e00dec..d7e4372bbc5a 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/sender.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/sender.go @@ -15,7 +15,12 @@ package adal // limitations under the License. import ( + "crypto/tls" "net/http" + "net/http/cookiejar" + "sync" + + "github.com/Azure/go-autorest/tracing" ) const ( @@ -23,6 +28,9 @@ const ( mimeTypeFormPost = "application/x-www-form-urlencoded" ) +var defaultSender Sender +var defaultSenderInit = &sync.Once{} + // Sender is the interface that wraps the Do method to send HTTP requests. // // The standard http.Client conforms to this interface. @@ -45,7 +53,7 @@ type SendDecorator func(Sender) Sender // CreateSender creates, decorates, and returns, as a Sender, the default http.Client. func CreateSender(decorators ...SendDecorator) Sender { - return DecorateSender(&http.Client{}, decorators...) + return DecorateSender(sender(), decorators...) } // DecorateSender accepts a Sender and a, possibly empty, set of SendDecorators, which is applies to @@ -58,3 +66,30 @@ func DecorateSender(s Sender, decorators ...SendDecorator) Sender { } return s } + +func sender() Sender { + // note that we can't init defaultSender in init() since it will + // execute before calling code has had a chance to enable tracing + defaultSenderInit.Do(func() { + // Use behaviour compatible with DefaultTransport, but require TLS minimum version. + defaultTransport := http.DefaultTransport.(*http.Transport) + transport := &http.Transport{ + Proxy: defaultTransport.Proxy, + DialContext: defaultTransport.DialContext, + MaxIdleConns: defaultTransport.MaxIdleConns, + IdleConnTimeout: defaultTransport.IdleConnTimeout, + TLSHandshakeTimeout: defaultTransport.TLSHandshakeTimeout, + ExpectContinueTimeout: defaultTransport.ExpectContinueTimeout, + TLSClientConfig: &tls.Config{ + MinVersion: tls.VersionTLS12, + }, + } + var roundTripper http.RoundTripper = transport + if tracing.IsEnabled() { + roundTripper = tracing.NewTransport(transport) + } + j, _ := cookiejar.New(nil) + defaultSender = &http.Client{Jar: j, Transport: roundTripper} + }) + return defaultSender +} diff --git a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go index 4083e76e693b..33bbd6ea1505 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/adal/token.go +++ b/vendor/github.com/Azure/go-autorest/autorest/adal/token.go @@ -26,15 +26,14 @@ import ( "fmt" "io/ioutil" "math" - "net" "net/http" "net/url" + "os" "strings" "sync" "time" "github.com/Azure/go-autorest/autorest/date" - "github.com/Azure/go-autorest/tracing" "github.com/dgrijalva/jwt-go" ) @@ -64,6 +63,12 @@ const ( // the default number of attempts to refresh an MSI authentication token defaultMaxMSIRefreshAttempts = 5 + + // asMSIEndpointEnv is the environment variable used to store the endpoint on App Service and Functions + asMSIEndpointEnv = "MSI_ENDPOINT" + + // asMSISecretEnv is the environment variable used to store the request secret on App Service and Functions + asMSISecretEnv = "MSI_SECRET" ) // OAuthTokenProvider is an interface which should be implemented by an access token retriever @@ -101,6 +106,9 @@ type RefresherWithContext interface { // a successful token refresh type TokenRefreshCallback func(Token) error +// TokenRefresh is a type representing a custom callback to refresh a token +type TokenRefresh func(ctx context.Context, resource string) (*Token, error) + // Token encapsulates the access token used to authorize Azure requests. // https://docs.microsoft.com/en-us/azure/active-directory/develop/v1-oauth2-client-creds-grant-flow#service-to-service-access-token-response type Token struct { @@ -339,10 +347,11 @@ func (secret ServicePrincipalAuthorizationCodeSecret) MarshalJSON() ([]byte, err // ServicePrincipalToken encapsulates a Token created for a Service Principal. type ServicePrincipalToken struct { - inner servicePrincipalToken - refreshLock *sync.RWMutex - sender Sender - refreshCallbacks []TokenRefreshCallback + inner servicePrincipalToken + refreshLock *sync.RWMutex + sender Sender + customRefreshFunc TokenRefresh + refreshCallbacks []TokenRefreshCallback // MaxMSIRefreshAttempts is the maximum number of attempts to refresh an MSI token. MaxMSIRefreshAttempts int } @@ -357,6 +366,11 @@ func (spt *ServicePrincipalToken) SetRefreshCallbacks(callbacks []TokenRefreshCa spt.refreshCallbacks = callbacks } +// SetCustomRefreshFunc sets a custom refresh function used to refresh the token. +func (spt *ServicePrincipalToken) SetCustomRefreshFunc(customRefreshFunc TokenRefresh) { + spt.customRefreshFunc = customRefreshFunc +} + // MarshalJSON implements the json.Marshaler interface. func (spt ServicePrincipalToken) MarshalJSON() ([]byte, error) { return json.Marshal(spt.inner) @@ -396,7 +410,7 @@ func (spt *ServicePrincipalToken) UnmarshalJSON(data []byte) error { spt.refreshLock = &sync.RWMutex{} } if spt.sender == nil { - spt.sender = &http.Client{Transport: tracing.Transport} + spt.sender = sender() } return nil } @@ -444,7 +458,7 @@ func NewServicePrincipalTokenWithSecret(oauthConfig OAuthConfig, id string, reso RefreshWithin: defaultRefresh, }, refreshLock: &sync.RWMutex{}, - sender: &http.Client{Transport: tracing.Transport}, + sender: sender(), refreshCallbacks: callbacks, } return spt, nil @@ -635,6 +649,31 @@ func GetMSIVMEndpoint() (string, error) { return msiEndpoint, nil } +func isAppService() bool { + _, asMSIEndpointEnvExists := os.LookupEnv(asMSIEndpointEnv) + _, asMSISecretEnvExists := os.LookupEnv(asMSISecretEnv) + + return asMSIEndpointEnvExists && asMSISecretEnvExists +} + +// GetMSIAppServiceEndpoint get the MSI endpoint for App Service and Functions +func GetMSIAppServiceEndpoint() (string, error) { + asMSIEndpoint, asMSIEndpointEnvExists := os.LookupEnv(asMSIEndpointEnv) + + if asMSIEndpointEnvExists { + return asMSIEndpoint, nil + } + return "", errors.New("MSI endpoint not found") +} + +// GetMSIEndpoint get the appropriate MSI endpoint depending on the runtime environment +func GetMSIEndpoint() (string, error) { + if isAppService() { + return GetMSIAppServiceEndpoint() + } + return GetMSIVMEndpoint() +} + // NewServicePrincipalTokenFromMSI creates a ServicePrincipalToken via the MSI VM Extension. // It will use the system assigned identity when creating the token. func NewServicePrincipalTokenFromMSI(msiEndpoint, resource string, callbacks ...TokenRefreshCallback) (*ServicePrincipalToken, error) { @@ -667,7 +706,12 @@ func newServicePrincipalTokenFromMSI(msiEndpoint, resource string, userAssignedI v := url.Values{} v.Set("resource", resource) - v.Set("api-version", "2018-02-01") + // App Service MSI currently only supports token API version 2017-09-01 + if isAppService() { + v.Set("api-version", "2017-09-01") + } else { + v.Set("api-version", "2018-02-01") + } if userAssignedID != nil { v.Set("client_id", *userAssignedID) } @@ -685,7 +729,7 @@ func newServicePrincipalTokenFromMSI(msiEndpoint, resource string, userAssignedI RefreshWithin: defaultRefresh, }, refreshLock: &sync.RWMutex{}, - sender: &http.Client{Transport: tracing.Transport}, + sender: sender(), refreshCallbacks: callbacks, MaxMSIRefreshAttempts: defaultMaxMSIRefreshAttempts, } @@ -751,13 +795,13 @@ func (spt *ServicePrincipalToken) InvokeRefreshCallbacks(token Token) error { } // Refresh obtains a fresh token for the Service Principal. -// This method is not safe for concurrent use and should be syncrhonized. +// This method is safe for concurrent use. func (spt *ServicePrincipalToken) Refresh() error { return spt.RefreshWithContext(context.Background()) } // RefreshWithContext obtains a fresh token for the Service Principal. -// This method is not safe for concurrent use and should be syncrhonized. +// This method is safe for concurrent use. func (spt *ServicePrincipalToken) RefreshWithContext(ctx context.Context) error { spt.refreshLock.Lock() defer spt.refreshLock.Unlock() @@ -765,13 +809,13 @@ func (spt *ServicePrincipalToken) RefreshWithContext(ctx context.Context) error } // RefreshExchange refreshes the token, but for a different resource. -// This method is not safe for concurrent use and should be syncrhonized. +// This method is safe for concurrent use. func (spt *ServicePrincipalToken) RefreshExchange(resource string) error { return spt.RefreshExchangeWithContext(context.Background(), resource) } // RefreshExchangeWithContext refreshes the token, but for a different resource. -// This method is not safe for concurrent use and should be syncrhonized. +// This method is safe for concurrent use. func (spt *ServicePrincipalToken) RefreshExchangeWithContext(ctx context.Context, resource string) error { spt.refreshLock.Lock() defer spt.refreshLock.Unlock() @@ -794,15 +838,29 @@ func isIMDS(u url.URL) bool { if err != nil { return false } - return u.Host == imds.Host && u.Path == imds.Path + return (u.Host == imds.Host && u.Path == imds.Path) || isAppService() } func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource string) error { + if spt.customRefreshFunc != nil { + token, err := spt.customRefreshFunc(ctx, resource) + if err != nil { + return err + } + spt.inner.Token = *token + return spt.InvokeRefreshCallbacks(spt.inner.Token) + } + req, err := http.NewRequest(http.MethodPost, spt.inner.OauthConfig.TokenEndpoint.String(), nil) if err != nil { return fmt.Errorf("adal: Failed to build the refresh request. Error = '%v'", err) } req.Header.Add("User-Agent", UserAgent()) + // Add header when runtime is on App Service or Functions + if isAppService() { + asMSISecret, _ := os.LookupEnv(asMSISecretEnv) + req.Header.Add("Secret", asMSISecret) + } req = req.WithContext(ctx) if !isIMDS(spt.inner.OauthConfig.TokenEndpoint) { v := url.Values{} @@ -847,7 +905,8 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource resp, err = spt.sender.Do(req) } if err != nil { - return newTokenRefreshError(fmt.Sprintf("adal: Failed to execute the refresh request. Error = '%v'", err), nil) + // don't return a TokenRefreshError here; this will allow retry logic to apply + return fmt.Errorf("adal: Failed to execute the refresh request. Error = '%v'", err) } defer resp.Body.Close() @@ -914,10 +973,8 @@ func retryForIMDS(sender Sender, req *http.Request, maxAttempts int) (resp *http for attempt < maxAttempts { resp, err = sender.Do(req) - // retry on temporary network errors, e.g. transient network failures. - // if we don't receive a response then assume we can't connect to the - // endpoint so we're likely not running on an Azure VM so don't retry. - if (err != nil && !isTemporaryNetworkError(err)) || resp == nil || resp.StatusCode == http.StatusOK || !containsInt(retries, resp.StatusCode) { + // we want to retry if err is not nil or the status code is in the list of retry codes + if err == nil && !responseHasStatusCode(resp, retries...) { return } @@ -941,20 +998,12 @@ func retryForIMDS(sender Sender, req *http.Request, maxAttempts int) (resp *http return } -// returns true if the specified error is a temporary network error or false if it's not. -// if the error doesn't implement the net.Error interface the return value is true. -func isTemporaryNetworkError(err error) bool { - if netErr, ok := err.(net.Error); !ok || (ok && netErr.Temporary()) { - return true - } - return false -} - -// returns true if slice ints contains the value n -func containsInt(ints []int, n int) bool { - for _, i := range ints { - if i == n { - return true +func responseHasStatusCode(resp *http.Response, codes ...int) bool { + if resp != nil { + for _, i := range codes { + if i == resp.StatusCode { + return true + } } } return false @@ -1024,6 +1073,32 @@ func (mt *MultiTenantServicePrincipalToken) EnsureFreshWithContext(ctx context.C return nil } +// RefreshWithContext obtains a fresh token for the Service Principal. +func (mt *MultiTenantServicePrincipalToken) RefreshWithContext(ctx context.Context) error { + if err := mt.PrimaryToken.RefreshWithContext(ctx); err != nil { + return fmt.Errorf("failed to refresh primary token: %v", err) + } + for _, aux := range mt.AuxiliaryTokens { + if err := aux.RefreshWithContext(ctx); err != nil { + return fmt.Errorf("failed to refresh auxiliary token: %v", err) + } + } + return nil +} + +// RefreshExchangeWithContext refreshes the token, but for a different resource. +func (mt *MultiTenantServicePrincipalToken) RefreshExchangeWithContext(ctx context.Context, resource string) error { + if err := mt.PrimaryToken.RefreshExchangeWithContext(ctx, resource); err != nil { + return fmt.Errorf("failed to refresh primary token: %v", err) + } + for _, aux := range mt.AuxiliaryTokens { + if err := aux.RefreshExchangeWithContext(ctx, resource); err != nil { + return fmt.Errorf("failed to refresh auxiliary token: %v", err) + } + } + return nil +} + // NewMultiTenantServicePrincipalToken creates a new MultiTenantServicePrincipalToken with the specified credentials and resource. func NewMultiTenantServicePrincipalToken(multiTenantCfg MultiTenantOAuthConfig, clientID string, secret string, resource string) (*MultiTenantServicePrincipalToken, error) { if err := validateStringParam(clientID, "clientID"); err != nil { diff --git a/vendor/github.com/Azure/go-autorest/autorest/authorization.go b/vendor/github.com/Azure/go-autorest/autorest/authorization.go index 380865cd6afb..54e87b5b648c 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/authorization.go +++ b/vendor/github.com/Azure/go-autorest/autorest/authorization.go @@ -15,6 +15,7 @@ package autorest // limitations under the License. import ( + "crypto/tls" "encoding/base64" "fmt" "net/http" @@ -22,7 +23,6 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/adal" - "github.com/Azure/go-autorest/tracing" ) const ( @@ -149,11 +149,11 @@ type BearerAuthorizerCallback struct { // NewBearerAuthorizerCallback creates a bearer authorization callback. The callback // is invoked when the HTTP request is submitted. -func NewBearerAuthorizerCallback(sender Sender, callback BearerAuthorizerCallbackFunc) *BearerAuthorizerCallback { - if sender == nil { - sender = &http.Client{Transport: tracing.Transport} +func NewBearerAuthorizerCallback(s Sender, callback BearerAuthorizerCallbackFunc) *BearerAuthorizerCallback { + if s == nil { + s = sender(tls.RenegotiateNever) } - return &BearerAuthorizerCallback{sender: sender, callback: callback} + return &BearerAuthorizerCallback{sender: s, callback: callback} } // WithAuthorization returns a PrepareDecorator that adds an HTTP Authorization header whose value diff --git a/vendor/github.com/Azure/go-autorest/autorest/authorization_sas.go b/vendor/github.com/Azure/go-autorest/autorest/authorization_sas.go new file mode 100644 index 000000000000..89a659cb6646 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/authorization_sas.go @@ -0,0 +1,67 @@ +package autorest + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import ( + "fmt" + "net/http" + "strings" +) + +// SASTokenAuthorizer implements an authorization for SAS Token Authentication +// this can be used for interaction with Blob Storage Endpoints +type SASTokenAuthorizer struct { + sasToken string +} + +// NewSASTokenAuthorizer creates a SASTokenAuthorizer using the given credentials +func NewSASTokenAuthorizer(sasToken string) (*SASTokenAuthorizer, error) { + if strings.TrimSpace(sasToken) == "" { + return nil, fmt.Errorf("sasToken cannot be empty") + } + + token := sasToken + if strings.HasPrefix(sasToken, "?") { + token = strings.TrimPrefix(sasToken, "?") + } + + return &SASTokenAuthorizer{ + sasToken: token, + }, nil +} + +// WithAuthorization returns a PrepareDecorator that adds a shared access signature token to the +// URI's query parameters. This can be used for the Blob, Queue, and File Services. +// +// See https://docs.microsoft.com/en-us/rest/api/storageservices/delegate-access-with-shared-access-signature +func (sas *SASTokenAuthorizer) WithAuthorization() PrepareDecorator { + return func(p Preparer) Preparer { + return PreparerFunc(func(r *http.Request) (*http.Request, error) { + r, err := p.Prepare(r) + if err != nil { + return r, err + } + + if r.URL.RawQuery != "" { + r.URL.RawQuery = fmt.Sprintf("%s&%s", r.URL.RawQuery, sas.sasToken) + } else { + r.URL.RawQuery = sas.sasToken + } + + r.RequestURI = r.URL.String() + return Prepare(r) + }) + } +} diff --git a/vendor/github.com/Azure/go-autorest/autorest/authorization_storage.go b/vendor/github.com/Azure/go-autorest/autorest/authorization_storage.go new file mode 100644 index 000000000000..33e5f1270174 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/authorization_storage.go @@ -0,0 +1,301 @@ +package autorest + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import ( + "bytes" + "crypto/hmac" + "crypto/sha256" + "encoding/base64" + "fmt" + "net/http" + "net/url" + "sort" + "strings" + "time" +) + +// SharedKeyType defines the enumeration for the various shared key types. +// See https://docs.microsoft.com/en-us/rest/api/storageservices/authorize-with-shared-key for details on the shared key types. +type SharedKeyType string + +const ( + // SharedKey is used to authorize against blobs, files and queues services. + SharedKey SharedKeyType = "sharedKey" + + // SharedKeyForTable is used to authorize against the table service. + SharedKeyForTable SharedKeyType = "sharedKeyTable" + + // SharedKeyLite is used to authorize against blobs, files and queues services. It's provided for + // backwards compatibility with API versions before 2009-09-19. Prefer SharedKey instead. + SharedKeyLite SharedKeyType = "sharedKeyLite" + + // SharedKeyLiteForTable is used to authorize against the table service. It's provided for + // backwards compatibility with older table API versions. Prefer SharedKeyForTable instead. + SharedKeyLiteForTable SharedKeyType = "sharedKeyLiteTable" +) + +const ( + headerAccept = "Accept" + headerAcceptCharset = "Accept-Charset" + headerContentEncoding = "Content-Encoding" + headerContentLength = "Content-Length" + headerContentMD5 = "Content-MD5" + headerContentLanguage = "Content-Language" + headerIfModifiedSince = "If-Modified-Since" + headerIfMatch = "If-Match" + headerIfNoneMatch = "If-None-Match" + headerIfUnmodifiedSince = "If-Unmodified-Since" + headerDate = "Date" + headerXMSDate = "X-Ms-Date" + headerXMSVersion = "x-ms-version" + headerRange = "Range" +) + +const storageEmulatorAccountName = "devstoreaccount1" + +// SharedKeyAuthorizer implements an authorization for Shared Key +// this can be used for interaction with Blob, File and Queue Storage Endpoints +type SharedKeyAuthorizer struct { + accountName string + accountKey []byte + keyType SharedKeyType +} + +// NewSharedKeyAuthorizer creates a SharedKeyAuthorizer using the provided credentials and shared key type. +func NewSharedKeyAuthorizer(accountName, accountKey string, keyType SharedKeyType) (*SharedKeyAuthorizer, error) { + key, err := base64.StdEncoding.DecodeString(accountKey) + if err != nil { + return nil, fmt.Errorf("malformed storage account key: %v", err) + } + return &SharedKeyAuthorizer{ + accountName: accountName, + accountKey: key, + keyType: keyType, + }, nil +} + +// WithAuthorization returns a PrepareDecorator that adds an HTTP Authorization header whose +// value is " " followed by the computed key. +// This can be used for the Blob, Queue, and File Services +// +// from: https://docs.microsoft.com/en-us/rest/api/storageservices/authorize-with-shared-key +// You may use Shared Key authorization to authorize a request made against the +// 2009-09-19 version and later of the Blob and Queue services, +// and version 2014-02-14 and later of the File services. +func (sk *SharedKeyAuthorizer) WithAuthorization() PrepareDecorator { + return func(p Preparer) Preparer { + return PreparerFunc(func(r *http.Request) (*http.Request, error) { + r, err := p.Prepare(r) + if err != nil { + return r, err + } + + sk, err := buildSharedKey(sk.accountName, sk.accountKey, r, sk.keyType) + return Prepare(r, WithHeader(headerAuthorization, sk)) + }) + } +} + +func buildSharedKey(accName string, accKey []byte, req *http.Request, keyType SharedKeyType) (string, error) { + canRes, err := buildCanonicalizedResource(accName, req.URL.String(), keyType) + if err != nil { + return "", err + } + + if req.Header == nil { + req.Header = http.Header{} + } + + // ensure date is set + if req.Header.Get(headerDate) == "" && req.Header.Get(headerXMSDate) == "" { + date := time.Now().UTC().Format(http.TimeFormat) + req.Header.Set(headerXMSDate, date) + } + canString, err := buildCanonicalizedString(req.Method, req.Header, canRes, keyType) + if err != nil { + return "", err + } + return createAuthorizationHeader(accName, accKey, canString, keyType), nil +} + +func buildCanonicalizedResource(accountName, uri string, keyType SharedKeyType) (string, error) { + errMsg := "buildCanonicalizedResource error: %s" + u, err := url.Parse(uri) + if err != nil { + return "", fmt.Errorf(errMsg, err.Error()) + } + + cr := bytes.NewBufferString("") + if accountName != storageEmulatorAccountName { + cr.WriteString("/") + cr.WriteString(getCanonicalizedAccountName(accountName)) + } + + if len(u.Path) > 0 { + // Any portion of the CanonicalizedResource string that is derived from + // the resource's URI should be encoded exactly as it is in the URI. + // -- https://msdn.microsoft.com/en-gb/library/azure/dd179428.aspx + cr.WriteString(u.EscapedPath()) + } + + params, err := url.ParseQuery(u.RawQuery) + if err != nil { + return "", fmt.Errorf(errMsg, err.Error()) + } + + // See https://github.com/Azure/azure-storage-net/blob/master/Lib/Common/Core/Util/AuthenticationUtility.cs#L277 + if keyType == SharedKey { + if len(params) > 0 { + cr.WriteString("\n") + + keys := []string{} + for key := range params { + keys = append(keys, key) + } + sort.Strings(keys) + + completeParams := []string{} + for _, key := range keys { + if len(params[key]) > 1 { + sort.Strings(params[key]) + } + + completeParams = append(completeParams, fmt.Sprintf("%s:%s", key, strings.Join(params[key], ","))) + } + cr.WriteString(strings.Join(completeParams, "\n")) + } + } else { + // search for "comp" parameter, if exists then add it to canonicalizedresource + if v, ok := params["comp"]; ok { + cr.WriteString("?comp=" + v[0]) + } + } + + return string(cr.Bytes()), nil +} + +func getCanonicalizedAccountName(accountName string) string { + // since we may be trying to access a secondary storage account, we need to + // remove the -secondary part of the storage name + return strings.TrimSuffix(accountName, "-secondary") +} + +func buildCanonicalizedString(verb string, headers http.Header, canonicalizedResource string, keyType SharedKeyType) (string, error) { + contentLength := headers.Get(headerContentLength) + if contentLength == "0" { + contentLength = "" + } + date := headers.Get(headerDate) + if v := headers.Get(headerXMSDate); v != "" { + if keyType == SharedKey || keyType == SharedKeyLite { + date = "" + } else { + date = v + } + } + var canString string + switch keyType { + case SharedKey: + canString = strings.Join([]string{ + verb, + headers.Get(headerContentEncoding), + headers.Get(headerContentLanguage), + contentLength, + headers.Get(headerContentMD5), + headers.Get(headerContentType), + date, + headers.Get(headerIfModifiedSince), + headers.Get(headerIfMatch), + headers.Get(headerIfNoneMatch), + headers.Get(headerIfUnmodifiedSince), + headers.Get(headerRange), + buildCanonicalizedHeader(headers), + canonicalizedResource, + }, "\n") + case SharedKeyForTable: + canString = strings.Join([]string{ + verb, + headers.Get(headerContentMD5), + headers.Get(headerContentType), + date, + canonicalizedResource, + }, "\n") + case SharedKeyLite: + canString = strings.Join([]string{ + verb, + headers.Get(headerContentMD5), + headers.Get(headerContentType), + date, + buildCanonicalizedHeader(headers), + canonicalizedResource, + }, "\n") + case SharedKeyLiteForTable: + canString = strings.Join([]string{ + date, + canonicalizedResource, + }, "\n") + default: + return "", fmt.Errorf("key type '%s' is not supported", keyType) + } + return canString, nil +} + +func buildCanonicalizedHeader(headers http.Header) string { + cm := make(map[string]string) + + for k := range headers { + headerName := strings.TrimSpace(strings.ToLower(k)) + if strings.HasPrefix(headerName, "x-ms-") { + cm[headerName] = headers.Get(k) + } + } + + if len(cm) == 0 { + return "" + } + + keys := []string{} + for key := range cm { + keys = append(keys, key) + } + + sort.Strings(keys) + + ch := bytes.NewBufferString("") + + for _, key := range keys { + ch.WriteString(key) + ch.WriteRune(':') + ch.WriteString(cm[key]) + ch.WriteRune('\n') + } + + return strings.TrimSuffix(string(ch.Bytes()), "\n") +} + +func createAuthorizationHeader(accountName string, accountKey []byte, canonicalizedString string, keyType SharedKeyType) string { + h := hmac.New(sha256.New, accountKey) + h.Write([]byte(canonicalizedString)) + signature := base64.StdEncoding.EncodeToString(h.Sum(nil)) + var key string + switch keyType { + case SharedKey, SharedKeyForTable: + key = "SharedKey" + case SharedKeyLite, SharedKeyLiteForTable: + key = "SharedKeyLite" + } + return fmt.Sprintf("%s %s:%s", key, getCanonicalizedAccountName(accountName), signature) +} diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/auth.go b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/auth.go index b6ef128396eb..5f02026b391c 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/auth.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/auth.go @@ -715,7 +715,7 @@ type MSIConfig struct { // Authorizer gets the authorizer from MSI. func (mc MSIConfig) Authorizer() (autorest.Authorizer, error) { - msiEndpoint, err := adal.GetMSIVMEndpoint() + msiEndpoint, err := adal.GetMSIEndpoint() if err != nil { return nil, err } diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.mod b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.mod index 9605c97117ec..4bebbdc242af 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.mod @@ -3,9 +3,9 @@ module github.com/Azure/go-autorest/autorest/azure/auth go 1.12 require ( - github.com/Azure/go-autorest/autorest v0.1.0 - github.com/Azure/go-autorest/autorest/adal v0.1.0 - github.com/Azure/go-autorest/autorest/azure/cli v0.1.0 + github.com/Azure/go-autorest/autorest v0.9.3 + github.com/Azure/go-autorest/autorest/adal v0.8.1 + github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 github.com/dimchansky/utfbom v1.1.0 - golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480 + golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 ) diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.sum b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.sum index 39f37022a6a3..9ea3fa575190 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.sum +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go.sum @@ -1,153 +1,39 @@ -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= -contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc= -contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= -github.com/Azure/go-autorest/autorest v0.1.0 h1:z68s0uL7bVfplrwwCUsYoMezUVQdym6EPOllAT02BtU= -github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= -github.com/Azure/go-autorest/autorest/adal v0.1.0 h1:RSw/7EAullliqwkZvgIGDYZWQm1PGKXI8c4aY/87yuU= -github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= -github.com/Azure/go-autorest/autorest/azure/cli v0.1.0 h1:YTtBrcb6mhA+PoSW8WxFDoIIyjp13XqJeX80ssQtri4= -github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U= +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.9.3 h1:OZEIaBbMdUE/Js+BQKlpO81XlISgipr6yDJ+PSwsgi4= +github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/adal v0.8.1 h1:pZdL8o72rK+avFWl+p9nE8RWi1JInZrWJYlnpfXJwHk= +github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 h1:LXl088ZQlP0SBppGFsRZonW6hSvwgL5gRByMbvUbx8U= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/mocks v0.1.0 h1:Kx+AUU2Te+A3JIyYn6Dfs+cFgx5XorQKuIXrZGoq/SI= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.1.0 h1:TRBxC5Pj/fIuh4Qob0ZpkggbfT8RC0SubHbpV3p4/Vc= -github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -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-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-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.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.2.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-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -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= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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-20190418165655-df01cb2cc480 h1:O5YqonU5IWby+w98jVUG9h7zlCWCcH4RHyPVReBmhzk= -golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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/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-20180906233101-161cd47e91fd/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-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-20190125091013-d26f9f9a57f3/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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -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/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 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180909124046-d0be0721c37e/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -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= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go_mod_tidy_hack.go new file mode 100644 index 000000000000..2f09cd177aa5 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/auth/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package auth + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go b/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go index 3a0a439ff930..26be936b7e5f 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/azure.go @@ -17,6 +17,7 @@ package azure // limitations under the License. import ( + "bytes" "encoding/json" "fmt" "io/ioutil" @@ -143,7 +144,7 @@ type RequestError struct { autorest.DetailedError // The error returned by the Azure service. - ServiceError *ServiceError `json:"error"` + ServiceError *ServiceError `json:"error" xml:"Error"` // The request id (from the x-ms-request-id-header) of the request. RequestID string @@ -285,26 +286,34 @@ func WithErrorUnlessStatusCode(codes ...int) autorest.RespondDecorator { var e RequestError defer resp.Body.Close() + encodedAs := autorest.EncodedAsJSON + if strings.Contains(resp.Header.Get("Content-Type"), "xml") { + encodedAs = autorest.EncodedAsXML + } + // Copy and replace the Body in case it does not contain an error object. // This will leave the Body available to the caller. - b, decodeErr := autorest.CopyAndDecode(autorest.EncodedAsJSON, resp.Body, &e) + b, decodeErr := autorest.CopyAndDecode(encodedAs, resp.Body, &e) resp.Body = ioutil.NopCloser(&b) if decodeErr != nil { return fmt.Errorf("autorest/azure: error response cannot be parsed: %q error: %v", b.String(), decodeErr) } if e.ServiceError == nil { // Check if error is unwrapped ServiceError - if err := json.Unmarshal(b.Bytes(), &e.ServiceError); err != nil { + decoder := autorest.NewDecoder(encodedAs, bytes.NewReader(b.Bytes())) + if err := decoder.Decode(&e.ServiceError); err != nil { return err } } if e.ServiceError.Message == "" { // if we're here it means the returned error wasn't OData v4 compliant. - // try to unmarshal the body as raw JSON in hopes of getting something. + // try to unmarshal the body in hopes of getting something. rawBody := map[string]interface{}{} - if err := json.Unmarshal(b.Bytes(), &rawBody); err != nil { + decoder := autorest.NewDecoder(encodedAs, bytes.NewReader(b.Bytes())) + if err := decoder.Decode(&rawBody); err != nil { return err } + e.ServiceError = &ServiceError{ Code: "Unknown", Message: "Unknown service error", diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.mod b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.mod index a147222b4e39..a58302914dc5 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.mod @@ -3,8 +3,9 @@ module github.com/Azure/go-autorest/autorest/azure/cli go 1.12 require ( - github.com/Azure/go-autorest/autorest/adal v0.1.0 - github.com/Azure/go-autorest/autorest/date v0.1.0 + github.com/Azure/go-autorest/autorest v0.9.0 + github.com/Azure/go-autorest/autorest/adal v0.8.0 + github.com/Azure/go-autorest/autorest/date v0.2.0 github.com/dimchansky/utfbom v1.1.0 github.com/mitchellh/go-homedir v1.1.0 ) diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.sum b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.sum index 1d098cff2136..542806b94711 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.sum +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go.sum @@ -1,144 +1,29 @@ -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= -contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc= -contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= -github.com/Azure/go-autorest/autorest/adal v0.1.0 h1:RSw/7EAullliqwkZvgIGDYZWQm1PGKXI8c4aY/87yuU= -github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/mocks v0.1.0 h1:Kx+AUU2Te+A3JIyYn6Dfs+cFgx5XorQKuIXrZGoq/SI= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/tracing v0.1.0 h1:TRBxC5Pj/fIuh4Qob0ZpkggbfT8RC0SubHbpV3p4/Vc= -github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -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-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-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.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.2.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-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -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= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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/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-20180906233101-161cd47e91fd/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-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-20190125091013-d26f9f9a57f3/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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -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/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 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180909124046-d0be0721c37e/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -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= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go_mod_tidy_hack.go new file mode 100644 index 000000000000..618bed392fc5 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package cli + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go index a336b958d463..f45c3a516d9f 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/profile.go @@ -51,9 +51,13 @@ type User struct { const azureProfileJSON = "azureProfile.json" +func configDir() string { + return os.Getenv("AZURE_CONFIG_DIR") +} + // ProfilePath returns the path where the Azure Profile is stored from the Azure CLI func ProfilePath() (string, error) { - if cfgDir := os.Getenv("AZURE_CONFIG_DIR"); cfgDir != "" { + if cfgDir := configDir(); cfgDir != "" { return filepath.Join(cfgDir, azureProfileJSON), nil } return homedir.Expand("~/.azure/" + azureProfileJSON) diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/token.go b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/token.go index 810075ba61f8..44ff446f6697 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/cli/token.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/cli/token.go @@ -20,6 +20,7 @@ import ( "fmt" "os" "os/exec" + "path/filepath" "regexp" "runtime" "strconv" @@ -44,6 +45,8 @@ type Token struct { UserID string `json:"userId"` } +const accessTokensJSON = "accessTokens.json" + // ToADALToken converts an Azure CLI `Token`` to an `adal.Token`` func (t Token) ToADALToken() (converted adal.Token, err error) { tokenExpirationDate, err := ParseExpirationDate(t.ExpiresOn) @@ -68,17 +71,19 @@ func (t Token) ToADALToken() (converted adal.Token, err error) { // AccessTokensPath returns the path where access tokens are stored from the Azure CLI // TODO(#199): add unit test. func AccessTokensPath() (string, error) { - // Azure-CLI allows user to customize the path of access tokens thorugh environment variable. - var accessTokenPath = os.Getenv("AZURE_ACCESS_TOKEN_FILE") - var err error + // Azure-CLI allows user to customize the path of access tokens through environment variable. + if accessTokenPath := os.Getenv("AZURE_ACCESS_TOKEN_FILE"); accessTokenPath != "" { + return accessTokenPath, nil + } - // Fallback logic to default path on non-cloud-shell environment. - // TODO(#200): remove the dependency on hard-coding path. - if accessTokenPath == "" { - accessTokenPath, err = homedir.Expand("~/.azure/accessTokens.json") + // Azure-CLI allows user to customize the path to Azure config directory through environment variable. + if cfgDir := configDir(); cfgDir != "" { + return filepath.Join(cfgDir, accessTokensJSON), nil } - return accessTokenPath, err + // Fallback logic to default path on non-cloud-shell environment. + // TODO(#200): remove the dependency on hard-coding path. + return homedir.Expand("~/.azure/" + accessTokensJSON) } // ParseExpirationDate parses either a Azure CLI or CloudShell date into a time object diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go index 86ce9f2b5b1e..c6d39f686655 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/rp.go @@ -47,11 +47,15 @@ func DoRetryWithRegistration(client autorest.Client) autorest.SendDecorator { if resp.StatusCode != http.StatusConflict || client.SkipResourceProviderRegistration { return resp, err } + var re RequestError - err = autorest.Respond( - resp, - autorest.ByUnmarshallingJSON(&re), - ) + if strings.Contains(r.Header.Get("Content-Type"), "xml") { + // XML errors (e.g. Storage Data Plane) only return the inner object + err = autorest.Respond(resp, autorest.ByUnmarshallingXML(&re.ServiceError)) + } else { + err = autorest.Respond(resp, autorest.ByUnmarshallingJSON(&re)) + } + if err != nil { return resp, err } diff --git a/vendor/github.com/Azure/go-autorest/autorest/client.go b/vendor/github.com/Azure/go-autorest/autorest/client.go index 92da6adb2c7d..1c6a0617a1fe 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/client.go +++ b/vendor/github.com/Azure/go-autorest/autorest/client.go @@ -22,12 +22,10 @@ import ( "io/ioutil" "log" "net/http" - "net/http/cookiejar" "strings" "time" "github.com/Azure/go-autorest/logger" - "github.com/Azure/go-autorest/tracing" ) const ( @@ -264,30 +262,8 @@ func (c Client) Do(r *http.Request) (*http.Response, error) { // sender returns the Sender to which to send requests. func (c Client) sender(renengotiation tls.RenegotiationSupport) Sender { if c.Sender == nil { - // Use behaviour compatible with DefaultTransport, but require TLS minimum version. - var defaultTransport = http.DefaultTransport.(*http.Transport) - transport := tracing.Transport - // for non-default values of TLS renegotiation create a new tracing transport. - // updating tracing.Transport affects all clients which is not what we want. - if renengotiation != tls.RenegotiateNever { - transport = tracing.NewTransport() - } - transport.Base = &http.Transport{ - Proxy: defaultTransport.Proxy, - DialContext: defaultTransport.DialContext, - MaxIdleConns: defaultTransport.MaxIdleConns, - IdleConnTimeout: defaultTransport.IdleConnTimeout, - TLSHandshakeTimeout: defaultTransport.TLSHandshakeTimeout, - ExpectContinueTimeout: defaultTransport.ExpectContinueTimeout, - TLSClientConfig: &tls.Config{ - MinVersion: tls.VersionTLS12, - Renegotiation: renengotiation, - }, - } - j, _ := cookiejar.New(nil) - return &http.Client{Jar: j, Transport: transport} + return sender(renengotiation) } - return c.Sender } diff --git a/vendor/github.com/Azure/go-autorest/autorest/date/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/date/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/date/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/date/go.mod b/vendor/github.com/Azure/go-autorest/autorest/date/go.mod index 13a1e9803386..3adc4804c3d2 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/date/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/date/go.mod @@ -1,3 +1,5 @@ module github.com/Azure/go-autorest/autorest/date go 1.12 + +require github.com/Azure/go-autorest/autorest v0.9.0 diff --git a/vendor/github.com/Azure/go-autorest/autorest/date/go.sum b/vendor/github.com/Azure/go-autorest/autorest/date/go.sum new file mode 100644 index 000000000000..9e2ee7a94844 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/date/go.sum @@ -0,0 +1,16 @@ +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/vendor/github.com/Azure/go-autorest/autorest/date/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/date/go_mod_tidy_hack.go new file mode 100644 index 000000000000..55adf930f4ab --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/date/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package date + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/go.mod b/vendor/github.com/Azure/go-autorest/autorest/go.mod index 6b7c7f2762b7..6f1fcd4a4dbd 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/go.mod @@ -3,10 +3,9 @@ module github.com/Azure/go-autorest/autorest go 1.12 require ( - github.com/Azure/go-autorest/autorest/adal v0.2.0 - github.com/Azure/go-autorest/autorest/mocks v0.1.0 + github.com/Azure/go-autorest/autorest/adal v0.8.0 + github.com/Azure/go-autorest/autorest/mocks v0.3.0 github.com/Azure/go-autorest/logger v0.1.0 - github.com/Azure/go-autorest/tracing v0.1.0 - go.opencensus.io v0.20.2 - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + github.com/Azure/go-autorest/tracing v0.5.0 + golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 ) diff --git a/vendor/github.com/Azure/go-autorest/autorest/go.sum b/vendor/github.com/Azure/go-autorest/autorest/go.sum index a6848303f437..e0d94da0a253 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/go.sum +++ b/vendor/github.com/Azure/go-autorest/autorest/go.sum @@ -1,143 +1,30 @@ -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= -contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc= -contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= -github.com/Azure/go-autorest/autorest/adal v0.2.0 h1:7IBDu1jgh+ADHXnEYExkV9RE/ztOOlxdACkkPRthGKw= -github.com/Azure/go-autorest/autorest/adal v0.2.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/mocks v0.1.0 h1:Kx+AUU2Te+A3JIyYn6Dfs+cFgx5XorQKuIXrZGoq/SI= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.1.0 h1:TRBxC5Pj/fIuh4Qob0ZpkggbfT8RC0SubHbpV3p4/Vc= -github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -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-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-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.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.2.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-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -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= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -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/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-20180906233101-161cd47e91fd/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-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-20190125091013-d26f9f9a57f3/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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -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/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 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180909124046-d0be0721c37e/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -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= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/github.com/Azure/go-autorest/autorest/preparer.go b/vendor/github.com/Azure/go-autorest/autorest/preparer.go index 9f864ab1a15f..6e8ed64eba1c 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/preparer.go +++ b/vendor/github.com/Azure/go-autorest/autorest/preparer.go @@ -523,7 +523,7 @@ func parseURL(u *url.URL, path string) (*url.URL, error) { // WithQueryParameters returns a PrepareDecorators that encodes and applies the query parameters // given in the supplied map (i.e., key=value). func WithQueryParameters(queryParameters map[string]interface{}) PrepareDecorator { - parameters := ensureValueStrings(queryParameters) + parameters := MapToValues(queryParameters) return func(p Preparer) Preparer { return PreparerFunc(func(r *http.Request) (*http.Request, error) { r, err := p.Prepare(r) @@ -531,14 +531,16 @@ func WithQueryParameters(queryParameters map[string]interface{}) PrepareDecorato if r.URL == nil { return r, NewError("autorest", "WithQueryParameters", "Invoked with a nil URL") } - v := r.URL.Query() for key, value := range parameters { - d, err := url.QueryUnescape(value) - if err != nil { - return r, err + for i := range value { + d, err := url.QueryUnescape(value[i]) + if err != nil { + return r, err + } + value[i] = d } - v.Add(key, d) + v[key] = value } r.URL.RawQuery = v.Encode() } diff --git a/vendor/github.com/Azure/go-autorest/autorest/sender.go b/vendor/github.com/Azure/go-autorest/autorest/sender.go index 92a55404af19..5e595d7b1a34 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/sender.go +++ b/vendor/github.com/Azure/go-autorest/autorest/sender.go @@ -16,10 +16,12 @@ package autorest import ( "context" + "crypto/tls" "fmt" "log" "math" "net/http" + "net/http/cookiejar" "strconv" "time" @@ -69,7 +71,7 @@ type SendDecorator func(Sender) Sender // CreateSender creates, decorates, and returns, as a Sender, the default http.Client. func CreateSender(decorators ...SendDecorator) Sender { - return DecorateSender(&http.Client{}, decorators...) + return DecorateSender(sender(tls.RenegotiateNever), decorators...) } // DecorateSender accepts a Sender and a, possibly empty, set of SendDecorators, which is applies to @@ -92,7 +94,7 @@ func DecorateSender(s Sender, decorators ...SendDecorator) Sender { // // Send will not poll or retry requests. func Send(r *http.Request, decorators ...SendDecorator) (*http.Response, error) { - return SendWithSender(&http.Client{Transport: tracing.Transport}, r, decorators...) + return SendWithSender(sender(tls.RenegotiateNever), r, decorators...) } // SendWithSender sends the passed http.Request, through the provided Sender, returning the @@ -104,6 +106,29 @@ func SendWithSender(s Sender, r *http.Request, decorators ...SendDecorator) (*ht return DecorateSender(s, decorators...).Do(r) } +func sender(renengotiation tls.RenegotiationSupport) Sender { + // Use behaviour compatible with DefaultTransport, but require TLS minimum version. + defaultTransport := http.DefaultTransport.(*http.Transport) + transport := &http.Transport{ + Proxy: defaultTransport.Proxy, + DialContext: defaultTransport.DialContext, + MaxIdleConns: defaultTransport.MaxIdleConns, + IdleConnTimeout: defaultTransport.IdleConnTimeout, + TLSHandshakeTimeout: defaultTransport.TLSHandshakeTimeout, + ExpectContinueTimeout: defaultTransport.ExpectContinueTimeout, + TLSClientConfig: &tls.Config{ + MinVersion: tls.VersionTLS12, + Renegotiation: renengotiation, + }, + } + var roundTripper http.RoundTripper = transport + if tracing.IsEnabled() { + roundTripper = tracing.NewTransport(transport) + } + j, _ := cookiejar.New(nil) + return &http.Client{Jar: j, Transport: roundTripper} +} + // AfterDelay returns a SendDecorator that delays for the passed time.Duration before // invoking the Sender. The delay may be terminated by closing the optional channel on the // http.Request. If canceled, no further Senders are invoked. @@ -264,10 +289,6 @@ func doRetryForStatusCodesImpl(s Sender, r *http.Request, count429 bool, attempt return } resp, err = s.Do(rr.Request()) - // if the error isn't temporary don't bother retrying - if err != nil && !IsTemporaryNetworkError(err) { - return - } // we want to retry if err is not nil (e.g. transient network failure). note that for failed authentication // resp and err will both have a value, so in this case we don't want to retry as it will never succeed. if err == nil && !ResponseHasStatusCode(resp, codes...) || IsTokenRefreshError(err) { diff --git a/vendor/github.com/Azure/go-autorest/autorest/to/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/to/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/to/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/to/go.mod b/vendor/github.com/Azure/go-autorest/autorest/to/go.mod index a2054be36cd8..48fd8c6e57b4 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/to/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/to/go.mod @@ -1,3 +1,5 @@ module github.com/Azure/go-autorest/autorest/to go 1.12 + +require github.com/Azure/go-autorest/autorest v0.9.0 diff --git a/vendor/github.com/Azure/go-autorest/autorest/to/go.sum b/vendor/github.com/Azure/go-autorest/autorest/to/go.sum new file mode 100644 index 000000000000..d7ee6b462311 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/to/go.sum @@ -0,0 +1,17 @@ +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/vendor/github.com/Azure/go-autorest/autorest/to/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/to/go_mod_tidy_hack.go new file mode 100644 index 000000000000..8e8292107071 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/to/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package to + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/utility.go b/vendor/github.com/Azure/go-autorest/autorest/utility.go index 08cf11c11898..27f824f544bc 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/utility.go +++ b/vendor/github.com/Azure/go-autorest/autorest/utility.go @@ -140,18 +140,18 @@ func MapToValues(m map[string]interface{}) url.Values { return v } -// AsStringSlice method converts interface{} to []string. This expects a -//that the parameter passed to be a slice or array of a type that has the underlying -//type a string. +// AsStringSlice method converts interface{} to []string. +// s must be of type slice or array or an error is returned. +// Each element of s will be converted to its string representation. func AsStringSlice(s interface{}) ([]string, error) { v := reflect.ValueOf(s) if v.Kind() != reflect.Slice && v.Kind() != reflect.Array { - return nil, NewError("autorest", "AsStringSlice", "the value's type is not an array.") + return nil, NewError("autorest", "AsStringSlice", "the value's type is not a slice or array.") } stringSlice := make([]string, 0, v.Len()) for i := 0; i < v.Len(); i++ { - stringSlice = append(stringSlice, v.Index(i).String()) + stringSlice = append(stringSlice, fmt.Sprintf("%v", v.Index(i))) } return stringSlice, nil } diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/LICENSE b/vendor/github.com/Azure/go-autorest/autorest/validation/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/validation/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/go.mod b/vendor/github.com/Azure/go-autorest/autorest/validation/go.mod index c44c51ff60c2..b3f9b6a09609 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/validation/go.mod +++ b/vendor/github.com/Azure/go-autorest/autorest/validation/go.mod @@ -2,4 +2,7 @@ module github.com/Azure/go-autorest/autorest/validation go 1.12 -require github.com/stretchr/testify v1.3.0 +require ( + github.com/Azure/go-autorest/autorest v0.9.0 + github.com/stretchr/testify v1.3.0 +) diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/go.sum b/vendor/github.com/Azure/go-autorest/autorest/validation/go.sum index 4347755afe82..6b9010a736d3 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/validation/go.sum +++ b/vendor/github.com/Azure/go-autorest/autorest/validation/go.sum @@ -1,7 +1,24 @@ +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/go_mod_tidy_hack.go b/vendor/github.com/Azure/go-autorest/autorest/validation/go_mod_tidy_hack.go new file mode 100644 index 000000000000..2b2668581e87 --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/autorest/validation/go_mod_tidy_hack.go @@ -0,0 +1,24 @@ +// +build modhack + +package validation + +// Copyright 2017 Microsoft Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file, and the github.com/Azure/go-autorest/autorest import, won't actually become part of +// the resultant binary. + +// Necessary for safely adding multi-module repo. +// See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository +import _ "github.com/Azure/go-autorest/autorest" diff --git a/vendor/github.com/Azure/go-autorest/autorest/version.go b/vendor/github.com/Azure/go-autorest/autorest/version.go index c446516968f4..6c1d865668d3 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/version.go +++ b/vendor/github.com/Azure/go-autorest/autorest/version.go @@ -19,7 +19,7 @@ import ( "runtime" ) -const number = "v12.4.1" +const number = "v13.3.2" var ( userAgent = fmt.Sprintf("Go/%s (%s-%s) go-autorest/%s", diff --git a/vendor/github.com/Azure/go-autorest/logger/LICENSE b/vendor/github.com/Azure/go-autorest/logger/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/logger/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/tracing/LICENSE b/vendor/github.com/Azure/go-autorest/tracing/LICENSE new file mode 100644 index 000000000000..b9d6a27ea92e --- /dev/null +++ b/vendor/github.com/Azure/go-autorest/tracing/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2015 Microsoft Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/Azure/go-autorest/tracing/go.mod b/vendor/github.com/Azure/go-autorest/tracing/go.mod index 6a9394c513f7..25c34c1085a7 100644 --- a/vendor/github.com/Azure/go-autorest/tracing/go.mod +++ b/vendor/github.com/Azure/go-autorest/tracing/go.mod @@ -1,13 +1,3 @@ module github.com/Azure/go-autorest/tracing go 1.12 - -require ( - // later releases of ocagent aren't compatible with our version of opencensus - contrib.go.opencensus.io/exporter/ocagent v0.3.0 - // keep this pre-v0.22.0 to avoid dependency on protobuf v1.3+ - go.opencensus.io v0.21.0 -) - -// pin this to v0.1.0 to avoid breaking changes incompatible with our version of ocagent -replace github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.1.0 diff --git a/vendor/github.com/Azure/go-autorest/tracing/go.sum b/vendor/github.com/Azure/go-autorest/tracing/go.sum deleted file mode 100644 index 736a4f4f2864..000000000000 --- a/vendor/github.com/Azure/go-autorest/tracing/go.sum +++ /dev/null @@ -1,68 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -contrib.go.opencensus.io/exporter/ocagent v0.3.0 h1:fyqPXp7d+BBV3tXa7EE1CYrObJr7R9jTAOO/AsdcQBg= -contrib.go.opencensus.io/exporter/ocagent v0.3.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/census-instrumentation/opencensus-proto v0.1.0 h1:VwZ9smxzX8u14/125wHIX7ARV+YhR+L4JADswwxWK0Y= -github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= -go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -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/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-20180906233101-161cd47e91fd/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 h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -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-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf h1:rjxqQmxjyqerRKEj+tZW+MCm4LgpFXu18bsEoCMgDsk= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= -google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/github.com/Azure/go-autorest/tracing/tracing.go b/vendor/github.com/Azure/go-autorest/tracing/tracing.go index 28951c2848c6..0e7a6e96254a 100644 --- a/vendor/github.com/Azure/go-autorest/tracing/tracing.go +++ b/vendor/github.com/Azure/go-autorest/tracing/tracing.go @@ -16,180 +16,52 @@ package tracing import ( "context" - "fmt" "net/http" - "os" - - "contrib.go.opencensus.io/exporter/ocagent" - "go.opencensus.io/plugin/ochttp" - "go.opencensus.io/plugin/ochttp/propagation/tracecontext" - "go.opencensus.io/stats/view" - "go.opencensus.io/trace" -) - -var ( - // Transport is the default tracing RoundTripper. The custom options setter will control - // if traces are being emitted or not. - Transport = NewTransport() - - // enabled is the flag for marking if tracing is enabled. - enabled = false - - // Sampler is the tracing sampler. If tracing is disabled it will never sample. Otherwise - // it will be using the parent sampler or the default. - sampler = trace.NeverSample() - - // Views for metric instrumentation. - views = map[string]*view.View{} - - // the trace exporter - traceExporter trace.Exporter ) -func init() { - enableFromEnv() +// Tracer represents an HTTP tracing facility. +type Tracer interface { + NewTransport(base *http.Transport) http.RoundTripper + StartSpan(ctx context.Context, name string) context.Context + EndSpan(ctx context.Context, httpStatusCode int, err error) } -func enableFromEnv() { - _, ok := os.LookupEnv("AZURE_SDK_TRACING_ENABLED") - _, legacyOk := os.LookupEnv("AZURE_SDK_TRACING_ENABELD") - if ok || legacyOk { - agentEndpoint, ok := os.LookupEnv("OCAGENT_TRACE_EXPORTER_ENDPOINT") - - if ok { - EnableWithAIForwarding(agentEndpoint) - } else { - Enable() - } - } -} +var ( + tracer Tracer +) -// NewTransport returns a new instance of a tracing-aware RoundTripper. -func NewTransport() *ochttp.Transport { - return &ochttp.Transport{ - Propagation: &tracecontext.HTTPFormat{}, - GetStartOptions: getStartOptions, - } +// Register will register the provided Tracer. Pass nil to unregister a Tracer. +func Register(t Tracer) { + tracer = t } -// IsEnabled returns true if monitoring is enabled for the sdk. +// IsEnabled returns true if a Tracer has been registered. func IsEnabled() bool { - return enabled -} - -// Enable will start instrumentation for metrics and traces. -func Enable() error { - enabled = true - sampler = nil - - err := initStats() - return err + return tracer != nil } -// Disable will disable instrumentation for metrics and traces. -func Disable() { - disableStats() - sampler = trace.NeverSample() - if traceExporter != nil { - trace.UnregisterExporter(traceExporter) +// NewTransport creates a new instrumenting http.RoundTripper for the +// registered Tracer. If no Tracer has been registered it returns nil. +func NewTransport(base *http.Transport) http.RoundTripper { + if tracer != nil { + return tracer.NewTransport(base) } - enabled = false + return nil } -// EnableWithAIForwarding will start instrumentation and will connect to app insights forwarder -// exporter making the metrics and traces available in app insights. -func EnableWithAIForwarding(agentEndpoint string) (err error) { - err = Enable() - if err != nil { - return err - } - - traceExporter, err := ocagent.NewExporter(ocagent.WithInsecure(), ocagent.WithAddress(agentEndpoint)) - if err != nil { - return err - } - trace.RegisterExporter(traceExporter) - return -} - -// getStartOptions is the custom options setter for the ochttp package. -func getStartOptions(*http.Request) trace.StartOptions { - return trace.StartOptions{ - Sampler: sampler, - } -} - -// initStats registers the views for the http metrics -func initStats() (err error) { - clientViews := []*view.View{ - ochttp.ClientCompletedCount, - ochttp.ClientRoundtripLatencyDistribution, - ochttp.ClientReceivedBytesDistribution, - ochttp.ClientSentBytesDistribution, - } - for _, cv := range clientViews { - vn := fmt.Sprintf("Azure/go-autorest/tracing-%s", cv.Name) - views[vn] = cv.WithName(vn) - err = view.Register(views[vn]) - if err != nil { - return err - } - } - return -} - -// disableStats will unregister the previously registered metrics -func disableStats() { - for _, v := range views { - view.Unregister(v) - } -} - -// StartSpan starts a trace span +// StartSpan starts a trace span with the specified name, associating it with the +// provided context. Has no effect if a Tracer has not been registered. func StartSpan(ctx context.Context, name string) context.Context { - ctx, _ = trace.StartSpan(ctx, name, trace.WithSampler(sampler)) + if tracer != nil { + return tracer.StartSpan(ctx, name) + } return ctx } -// EndSpan ends a previously started span stored in the context +// EndSpan ends a previously started span stored in the context. +// Has no effect if a Tracer has not been registered. func EndSpan(ctx context.Context, httpStatusCode int, err error) { - span := trace.FromContext(ctx) - - if span == nil { - return - } - - if err != nil { - span.SetStatus(trace.Status{Message: err.Error(), Code: toTraceStatusCode(httpStatusCode)}) - } - span.End() -} - -// toTraceStatusCode converts HTTP Codes to OpenCensus codes as defined -// at https://github.com/census-instrumentation/opencensus-specs/blob/master/trace/HTTP.md#status -func toTraceStatusCode(httpStatusCode int) int32 { - switch { - case http.StatusOK <= httpStatusCode && httpStatusCode < http.StatusBadRequest: - return trace.StatusCodeOK - case httpStatusCode == http.StatusBadRequest: - return trace.StatusCodeInvalidArgument - case httpStatusCode == http.StatusUnauthorized: // 401 is actually unauthenticated. - return trace.StatusCodeUnauthenticated - case httpStatusCode == http.StatusForbidden: - return trace.StatusCodePermissionDenied - case httpStatusCode == http.StatusNotFound: - return trace.StatusCodeNotFound - case httpStatusCode == http.StatusTooManyRequests: - return trace.StatusCodeResourceExhausted - case httpStatusCode == 499: - return trace.StatusCodeCancelled - case httpStatusCode == http.StatusNotImplemented: - return trace.StatusCodeUnimplemented - case httpStatusCode == http.StatusServiceUnavailable: - return trace.StatusCodeUnavailable - case httpStatusCode == http.StatusGatewayTimeout: - return trace.StatusCodeDeadlineExceeded - default: - return trace.StatusCodeUnknown + if tracer != nil { + tracer.EndSpan(ctx, httpStatusCode, err) } } diff --git a/vendor/github.com/BurntSushi/toml/.gitignore b/vendor/github.com/BurntSushi/toml/.gitignore new file mode 100644 index 000000000000..0cd3800377d4 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/.gitignore @@ -0,0 +1,5 @@ +TAGS +tags +.*.swp +tomlcheck/tomlcheck +toml.test diff --git a/vendor/github.com/BurntSushi/toml/.travis.yml b/vendor/github.com/BurntSushi/toml/.travis.yml new file mode 100644 index 000000000000..8b8afc4f0e00 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/.travis.yml @@ -0,0 +1,15 @@ +language: go +go: + - 1.1 + - 1.2 + - 1.3 + - 1.4 + - 1.5 + - 1.6 + - tip +install: + - go install ./... + - go get github.com/BurntSushi/toml-test +script: + - export PATH="$PATH:$HOME/gopath/bin" + - make test diff --git a/vendor/github.com/BurntSushi/toml/COMPATIBLE b/vendor/github.com/BurntSushi/toml/COMPATIBLE new file mode 100644 index 000000000000..6efcfd0ce55e --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/COMPATIBLE @@ -0,0 +1,3 @@ +Compatible with TOML version +[v0.4.0](https://github.com/toml-lang/toml/blob/v0.4.0/versions/en/toml-v0.4.0.md) + diff --git a/vendor/github.com/BurntSushi/toml/COPYING b/vendor/github.com/BurntSushi/toml/COPYING new file mode 100644 index 000000000000..01b5743200b8 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/COPYING @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 TOML authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/github.com/BurntSushi/toml/Makefile b/vendor/github.com/BurntSushi/toml/Makefile new file mode 100644 index 000000000000..3600848d331a --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/Makefile @@ -0,0 +1,19 @@ +install: + go install ./... + +test: install + go test -v + toml-test toml-test-decoder + toml-test -encoder toml-test-encoder + +fmt: + gofmt -w *.go */*.go + colcheck *.go */*.go + +tags: + find ./ -name '*.go' -print0 | xargs -0 gotags > TAGS + +push: + git push origin master + git push github master + diff --git a/vendor/github.com/BurntSushi/toml/README.md b/vendor/github.com/BurntSushi/toml/README.md new file mode 100644 index 000000000000..7c1b37ecc7a0 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/README.md @@ -0,0 +1,218 @@ +## TOML parser and encoder for Go with reflection + +TOML stands for Tom's Obvious, Minimal Language. This Go package provides a +reflection interface similar to Go's standard library `json` and `xml` +packages. This package also supports the `encoding.TextUnmarshaler` and +`encoding.TextMarshaler` interfaces so that you can define custom data +representations. (There is an example of this below.) + +Spec: https://github.com/toml-lang/toml + +Compatible with TOML version +[v0.4.0](https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md) + +Documentation: https://godoc.org/github.com/BurntSushi/toml + +Installation: + +```bash +go get github.com/BurntSushi/toml +``` + +Try the toml validator: + +```bash +go get github.com/BurntSushi/toml/cmd/tomlv +tomlv some-toml-file.toml +``` + +[![Build Status](https://travis-ci.org/BurntSushi/toml.svg?branch=master)](https://travis-ci.org/BurntSushi/toml) [![GoDoc](https://godoc.org/github.com/BurntSushi/toml?status.svg)](https://godoc.org/github.com/BurntSushi/toml) + +### Testing + +This package passes all tests in +[toml-test](https://github.com/BurntSushi/toml-test) for both the decoder +and the encoder. + +### Examples + +This package works similarly to how the Go standard library handles `XML` +and `JSON`. Namely, data is loaded into Go values via reflection. + +For the simplest example, consider some TOML file as just a list of keys +and values: + +```toml +Age = 25 +Cats = [ "Cauchy", "Plato" ] +Pi = 3.14 +Perfection = [ 6, 28, 496, 8128 ] +DOB = 1987-07-05T05:45:00Z +``` + +Which could be defined in Go as: + +```go +type Config struct { + Age int + Cats []string + Pi float64 + Perfection []int + DOB time.Time // requires `import time` +} +``` + +And then decoded with: + +```go +var conf Config +if _, err := toml.Decode(tomlData, &conf); err != nil { + // handle error +} +``` + +You can also use struct tags if your struct field name doesn't map to a TOML +key value directly: + +```toml +some_key_NAME = "wat" +``` + +```go +type TOML struct { + ObscureKey string `toml:"some_key_NAME"` +} +``` + +### Using the `encoding.TextUnmarshaler` interface + +Here's an example that automatically parses duration strings into +`time.Duration` values: + +```toml +[[song]] +name = "Thunder Road" +duration = "4m49s" + +[[song]] +name = "Stairway to Heaven" +duration = "8m03s" +``` + +Which can be decoded with: + +```go +type song struct { + Name string + Duration duration +} +type songs struct { + Song []song +} +var favorites songs +if _, err := toml.Decode(blob, &favorites); err != nil { + log.Fatal(err) +} + +for _, s := range favorites.Song { + fmt.Printf("%s (%s)\n", s.Name, s.Duration) +} +``` + +And you'll also need a `duration` type that satisfies the +`encoding.TextUnmarshaler` interface: + +```go +type duration struct { + time.Duration +} + +func (d *duration) UnmarshalText(text []byte) error { + var err error + d.Duration, err = time.ParseDuration(string(text)) + return err +} +``` + +### More complex usage + +Here's an example of how to load the example from the official spec page: + +```toml +# This is a TOML document. Boom. + +title = "TOML Example" + +[owner] +name = "Tom Preston-Werner" +organization = "GitHub" +bio = "GitHub Cofounder & CEO\nLikes tater tots and beer." +dob = 1979-05-27T07:32:00Z # First class dates? Why not? + +[database] +server = "192.168.1.1" +ports = [ 8001, 8001, 8002 ] +connection_max = 5000 +enabled = true + +[servers] + + # You can indent as you please. Tabs or spaces. TOML don't care. + [servers.alpha] + ip = "10.0.0.1" + dc = "eqdc10" + + [servers.beta] + ip = "10.0.0.2" + dc = "eqdc10" + +[clients] +data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it + +# Line breaks are OK when inside arrays +hosts = [ + "alpha", + "omega" +] +``` + +And the corresponding Go types are: + +```go +type tomlConfig struct { + Title string + Owner ownerInfo + DB database `toml:"database"` + Servers map[string]server + Clients clients +} + +type ownerInfo struct { + Name string + Org string `toml:"organization"` + Bio string + DOB time.Time +} + +type database struct { + Server string + Ports []int + ConnMax int `toml:"connection_max"` + Enabled bool +} + +type server struct { + IP string + DC string +} + +type clients struct { + Data [][]interface{} + Hosts []string +} +``` + +Note that a case insensitive match will be tried if an exact match can't be +found. + +A working example of the above can be found in `_examples/example.{go,toml}`. diff --git a/vendor/github.com/BurntSushi/toml/decode.go b/vendor/github.com/BurntSushi/toml/decode.go new file mode 100644 index 000000000000..b0fd51d5b6ea --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/decode.go @@ -0,0 +1,509 @@ +package toml + +import ( + "fmt" + "io" + "io/ioutil" + "math" + "reflect" + "strings" + "time" +) + +func e(format string, args ...interface{}) error { + return fmt.Errorf("toml: "+format, args...) +} + +// Unmarshaler is the interface implemented by objects that can unmarshal a +// TOML description of themselves. +type Unmarshaler interface { + UnmarshalTOML(interface{}) error +} + +// Unmarshal decodes the contents of `p` in TOML format into a pointer `v`. +func Unmarshal(p []byte, v interface{}) error { + _, err := Decode(string(p), v) + return err +} + +// Primitive is a TOML value that hasn't been decoded into a Go value. +// When using the various `Decode*` functions, the type `Primitive` may +// be given to any value, and its decoding will be delayed. +// +// A `Primitive` value can be decoded using the `PrimitiveDecode` function. +// +// The underlying representation of a `Primitive` value is subject to change. +// Do not rely on it. +// +// N.B. Primitive values are still parsed, so using them will only avoid +// the overhead of reflection. They can be useful when you don't know the +// exact type of TOML data until run time. +type Primitive struct { + undecoded interface{} + context Key +} + +// DEPRECATED! +// +// Use MetaData.PrimitiveDecode instead. +func PrimitiveDecode(primValue Primitive, v interface{}) error { + md := MetaData{decoded: make(map[string]bool)} + return md.unify(primValue.undecoded, rvalue(v)) +} + +// PrimitiveDecode is just like the other `Decode*` functions, except it +// decodes a TOML value that has already been parsed. Valid primitive values +// can *only* be obtained from values filled by the decoder functions, +// including this method. (i.e., `v` may contain more `Primitive` +// values.) +// +// Meta data for primitive values is included in the meta data returned by +// the `Decode*` functions with one exception: keys returned by the Undecoded +// method will only reflect keys that were decoded. Namely, any keys hidden +// behind a Primitive will be considered undecoded. Executing this method will +// update the undecoded keys in the meta data. (See the example.) +func (md *MetaData) PrimitiveDecode(primValue Primitive, v interface{}) error { + md.context = primValue.context + defer func() { md.context = nil }() + return md.unify(primValue.undecoded, rvalue(v)) +} + +// Decode will decode the contents of `data` in TOML format into a pointer +// `v`. +// +// TOML hashes correspond to Go structs or maps. (Dealer's choice. They can be +// used interchangeably.) +// +// TOML arrays of tables correspond to either a slice of structs or a slice +// of maps. +// +// TOML datetimes correspond to Go `time.Time` values. +// +// All other TOML types (float, string, int, bool and array) correspond +// to the obvious Go types. +// +// An exception to the above rules is if a type implements the +// encoding.TextUnmarshaler interface. In this case, any primitive TOML value +// (floats, strings, integers, booleans and datetimes) will be converted to +// a byte string and given to the value's UnmarshalText method. See the +// Unmarshaler example for a demonstration with time duration strings. +// +// Key mapping +// +// TOML keys can map to either keys in a Go map or field names in a Go +// struct. The special `toml` struct tag may be used to map TOML keys to +// struct fields that don't match the key name exactly. (See the example.) +// A case insensitive match to struct names will be tried if an exact match +// can't be found. +// +// The mapping between TOML values and Go values is loose. That is, there +// may exist TOML values that cannot be placed into your representation, and +// there may be parts of your representation that do not correspond to +// TOML values. This loose mapping can be made stricter by using the IsDefined +// and/or Undecoded methods on the MetaData returned. +// +// This decoder will not handle cyclic types. If a cyclic type is passed, +// `Decode` will not terminate. +func Decode(data string, v interface{}) (MetaData, error) { + rv := reflect.ValueOf(v) + if rv.Kind() != reflect.Ptr { + return MetaData{}, e("Decode of non-pointer %s", reflect.TypeOf(v)) + } + if rv.IsNil() { + return MetaData{}, e("Decode of nil %s", reflect.TypeOf(v)) + } + p, err := parse(data) + if err != nil { + return MetaData{}, err + } + md := MetaData{ + p.mapping, p.types, p.ordered, + make(map[string]bool, len(p.ordered)), nil, + } + return md, md.unify(p.mapping, indirect(rv)) +} + +// DecodeFile is just like Decode, except it will automatically read the +// contents of the file at `fpath` and decode it for you. +func DecodeFile(fpath string, v interface{}) (MetaData, error) { + bs, err := ioutil.ReadFile(fpath) + if err != nil { + return MetaData{}, err + } + return Decode(string(bs), v) +} + +// DecodeReader is just like Decode, except it will consume all bytes +// from the reader and decode it for you. +func DecodeReader(r io.Reader, v interface{}) (MetaData, error) { + bs, err := ioutil.ReadAll(r) + if err != nil { + return MetaData{}, err + } + return Decode(string(bs), v) +} + +// unify performs a sort of type unification based on the structure of `rv`, +// which is the client representation. +// +// Any type mismatch produces an error. Finding a type that we don't know +// how to handle produces an unsupported type error. +func (md *MetaData) unify(data interface{}, rv reflect.Value) error { + + // Special case. Look for a `Primitive` value. + if rv.Type() == reflect.TypeOf((*Primitive)(nil)).Elem() { + // Save the undecoded data and the key context into the primitive + // value. + context := make(Key, len(md.context)) + copy(context, md.context) + rv.Set(reflect.ValueOf(Primitive{ + undecoded: data, + context: context, + })) + return nil + } + + // Special case. Unmarshaler Interface support. + if rv.CanAddr() { + if v, ok := rv.Addr().Interface().(Unmarshaler); ok { + return v.UnmarshalTOML(data) + } + } + + // Special case. Handle time.Time values specifically. + // TODO: Remove this code when we decide to drop support for Go 1.1. + // This isn't necessary in Go 1.2 because time.Time satisfies the encoding + // interfaces. + if rv.Type().AssignableTo(rvalue(time.Time{}).Type()) { + return md.unifyDatetime(data, rv) + } + + // Special case. Look for a value satisfying the TextUnmarshaler interface. + if v, ok := rv.Interface().(TextUnmarshaler); ok { + return md.unifyText(data, v) + } + // BUG(burntsushi) + // The behavior here is incorrect whenever a Go type satisfies the + // encoding.TextUnmarshaler interface but also corresponds to a TOML + // hash or array. In particular, the unmarshaler should only be applied + // to primitive TOML values. But at this point, it will be applied to + // all kinds of values and produce an incorrect error whenever those values + // are hashes or arrays (including arrays of tables). + + k := rv.Kind() + + // laziness + if k >= reflect.Int && k <= reflect.Uint64 { + return md.unifyInt(data, rv) + } + switch k { + case reflect.Ptr: + elem := reflect.New(rv.Type().Elem()) + err := md.unify(data, reflect.Indirect(elem)) + if err != nil { + return err + } + rv.Set(elem) + return nil + case reflect.Struct: + return md.unifyStruct(data, rv) + case reflect.Map: + return md.unifyMap(data, rv) + case reflect.Array: + return md.unifyArray(data, rv) + case reflect.Slice: + return md.unifySlice(data, rv) + case reflect.String: + return md.unifyString(data, rv) + case reflect.Bool: + return md.unifyBool(data, rv) + case reflect.Interface: + // we only support empty interfaces. + if rv.NumMethod() > 0 { + return e("unsupported type %s", rv.Type()) + } + return md.unifyAnything(data, rv) + case reflect.Float32: + fallthrough + case reflect.Float64: + return md.unifyFloat64(data, rv) + } + return e("unsupported type %s", rv.Kind()) +} + +func (md *MetaData) unifyStruct(mapping interface{}, rv reflect.Value) error { + tmap, ok := mapping.(map[string]interface{}) + if !ok { + if mapping == nil { + return nil + } + return e("type mismatch for %s: expected table but found %T", + rv.Type().String(), mapping) + } + + for key, datum := range tmap { + var f *field + fields := cachedTypeFields(rv.Type()) + for i := range fields { + ff := &fields[i] + if ff.name == key { + f = ff + break + } + if f == nil && strings.EqualFold(ff.name, key) { + f = ff + } + } + if f != nil { + subv := rv + for _, i := range f.index { + subv = indirect(subv.Field(i)) + } + if isUnifiable(subv) { + md.decoded[md.context.add(key).String()] = true + md.context = append(md.context, key) + if err := md.unify(datum, subv); err != nil { + return err + } + md.context = md.context[0 : len(md.context)-1] + } else if f.name != "" { + // Bad user! No soup for you! + return e("cannot write unexported field %s.%s", + rv.Type().String(), f.name) + } + } + } + return nil +} + +func (md *MetaData) unifyMap(mapping interface{}, rv reflect.Value) error { + tmap, ok := mapping.(map[string]interface{}) + if !ok { + if tmap == nil { + return nil + } + return badtype("map", mapping) + } + if rv.IsNil() { + rv.Set(reflect.MakeMap(rv.Type())) + } + for k, v := range tmap { + md.decoded[md.context.add(k).String()] = true + md.context = append(md.context, k) + + rvkey := indirect(reflect.New(rv.Type().Key())) + rvval := reflect.Indirect(reflect.New(rv.Type().Elem())) + if err := md.unify(v, rvval); err != nil { + return err + } + md.context = md.context[0 : len(md.context)-1] + + rvkey.SetString(k) + rv.SetMapIndex(rvkey, rvval) + } + return nil +} + +func (md *MetaData) unifyArray(data interface{}, rv reflect.Value) error { + datav := reflect.ValueOf(data) + if datav.Kind() != reflect.Slice { + if !datav.IsValid() { + return nil + } + return badtype("slice", data) + } + sliceLen := datav.Len() + if sliceLen != rv.Len() { + return e("expected array length %d; got TOML array of length %d", + rv.Len(), sliceLen) + } + return md.unifySliceArray(datav, rv) +} + +func (md *MetaData) unifySlice(data interface{}, rv reflect.Value) error { + datav := reflect.ValueOf(data) + if datav.Kind() != reflect.Slice { + if !datav.IsValid() { + return nil + } + return badtype("slice", data) + } + n := datav.Len() + if rv.IsNil() || rv.Cap() < n { + rv.Set(reflect.MakeSlice(rv.Type(), n, n)) + } + rv.SetLen(n) + return md.unifySliceArray(datav, rv) +} + +func (md *MetaData) unifySliceArray(data, rv reflect.Value) error { + sliceLen := data.Len() + for i := 0; i < sliceLen; i++ { + v := data.Index(i).Interface() + sliceval := indirect(rv.Index(i)) + if err := md.unify(v, sliceval); err != nil { + return err + } + } + return nil +} + +func (md *MetaData) unifyDatetime(data interface{}, rv reflect.Value) error { + if _, ok := data.(time.Time); ok { + rv.Set(reflect.ValueOf(data)) + return nil + } + return badtype("time.Time", data) +} + +func (md *MetaData) unifyString(data interface{}, rv reflect.Value) error { + if s, ok := data.(string); ok { + rv.SetString(s) + return nil + } + return badtype("string", data) +} + +func (md *MetaData) unifyFloat64(data interface{}, rv reflect.Value) error { + if num, ok := data.(float64); ok { + switch rv.Kind() { + case reflect.Float32: + fallthrough + case reflect.Float64: + rv.SetFloat(num) + default: + panic("bug") + } + return nil + } + return badtype("float", data) +} + +func (md *MetaData) unifyInt(data interface{}, rv reflect.Value) error { + if num, ok := data.(int64); ok { + if rv.Kind() >= reflect.Int && rv.Kind() <= reflect.Int64 { + switch rv.Kind() { + case reflect.Int, reflect.Int64: + // No bounds checking necessary. + case reflect.Int8: + if num < math.MinInt8 || num > math.MaxInt8 { + return e("value %d is out of range for int8", num) + } + case reflect.Int16: + if num < math.MinInt16 || num > math.MaxInt16 { + return e("value %d is out of range for int16", num) + } + case reflect.Int32: + if num < math.MinInt32 || num > math.MaxInt32 { + return e("value %d is out of range for int32", num) + } + } + rv.SetInt(num) + } else if rv.Kind() >= reflect.Uint && rv.Kind() <= reflect.Uint64 { + unum := uint64(num) + switch rv.Kind() { + case reflect.Uint, reflect.Uint64: + // No bounds checking necessary. + case reflect.Uint8: + if num < 0 || unum > math.MaxUint8 { + return e("value %d is out of range for uint8", num) + } + case reflect.Uint16: + if num < 0 || unum > math.MaxUint16 { + return e("value %d is out of range for uint16", num) + } + case reflect.Uint32: + if num < 0 || unum > math.MaxUint32 { + return e("value %d is out of range for uint32", num) + } + } + rv.SetUint(unum) + } else { + panic("unreachable") + } + return nil + } + return badtype("integer", data) +} + +func (md *MetaData) unifyBool(data interface{}, rv reflect.Value) error { + if b, ok := data.(bool); ok { + rv.SetBool(b) + return nil + } + return badtype("boolean", data) +} + +func (md *MetaData) unifyAnything(data interface{}, rv reflect.Value) error { + rv.Set(reflect.ValueOf(data)) + return nil +} + +func (md *MetaData) unifyText(data interface{}, v TextUnmarshaler) error { + var s string + switch sdata := data.(type) { + case TextMarshaler: + text, err := sdata.MarshalText() + if err != nil { + return err + } + s = string(text) + case fmt.Stringer: + s = sdata.String() + case string: + s = sdata + case bool: + s = fmt.Sprintf("%v", sdata) + case int64: + s = fmt.Sprintf("%d", sdata) + case float64: + s = fmt.Sprintf("%f", sdata) + default: + return badtype("primitive (string-like)", data) + } + if err := v.UnmarshalText([]byte(s)); err != nil { + return err + } + return nil +} + +// rvalue returns a reflect.Value of `v`. All pointers are resolved. +func rvalue(v interface{}) reflect.Value { + return indirect(reflect.ValueOf(v)) +} + +// indirect returns the value pointed to by a pointer. +// Pointers are followed until the value is not a pointer. +// New values are allocated for each nil pointer. +// +// An exception to this rule is if the value satisfies an interface of +// interest to us (like encoding.TextUnmarshaler). +func indirect(v reflect.Value) reflect.Value { + if v.Kind() != reflect.Ptr { + if v.CanSet() { + pv := v.Addr() + if _, ok := pv.Interface().(TextUnmarshaler); ok { + return pv + } + } + return v + } + if v.IsNil() { + v.Set(reflect.New(v.Type().Elem())) + } + return indirect(reflect.Indirect(v)) +} + +func isUnifiable(rv reflect.Value) bool { + if rv.CanSet() { + return true + } + if _, ok := rv.Interface().(TextUnmarshaler); ok { + return true + } + return false +} + +func badtype(expected string, data interface{}) error { + return e("cannot load TOML value of type %T into a Go %s", data, expected) +} diff --git a/vendor/github.com/BurntSushi/toml/decode_meta.go b/vendor/github.com/BurntSushi/toml/decode_meta.go new file mode 100644 index 000000000000..b9914a6798cf --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/decode_meta.go @@ -0,0 +1,121 @@ +package toml + +import "strings" + +// MetaData allows access to meta information about TOML data that may not +// be inferrable via reflection. In particular, whether a key has been defined +// and the TOML type of a key. +type MetaData struct { + mapping map[string]interface{} + types map[string]tomlType + keys []Key + decoded map[string]bool + context Key // Used only during decoding. +} + +// IsDefined returns true if the key given exists in the TOML data. The key +// should be specified hierarchially. e.g., +// +// // access the TOML key 'a.b.c' +// IsDefined("a", "b", "c") +// +// IsDefined will return false if an empty key given. Keys are case sensitive. +func (md *MetaData) IsDefined(key ...string) bool { + if len(key) == 0 { + return false + } + + var hash map[string]interface{} + var ok bool + var hashOrVal interface{} = md.mapping + for _, k := range key { + if hash, ok = hashOrVal.(map[string]interface{}); !ok { + return false + } + if hashOrVal, ok = hash[k]; !ok { + return false + } + } + return true +} + +// Type returns a string representation of the type of the key specified. +// +// Type will return the empty string if given an empty key or a key that +// does not exist. Keys are case sensitive. +func (md *MetaData) Type(key ...string) string { + fullkey := strings.Join(key, ".") + if typ, ok := md.types[fullkey]; ok { + return typ.typeString() + } + return "" +} + +// Key is the type of any TOML key, including key groups. Use (MetaData).Keys +// to get values of this type. +type Key []string + +func (k Key) String() string { + return strings.Join(k, ".") +} + +func (k Key) maybeQuotedAll() string { + var ss []string + for i := range k { + ss = append(ss, k.maybeQuoted(i)) + } + return strings.Join(ss, ".") +} + +func (k Key) maybeQuoted(i int) string { + quote := false + for _, c := range k[i] { + if !isBareKeyChar(c) { + quote = true + break + } + } + if quote { + return "\"" + strings.Replace(k[i], "\"", "\\\"", -1) + "\"" + } + return k[i] +} + +func (k Key) add(piece string) Key { + newKey := make(Key, len(k)+1) + copy(newKey, k) + newKey[len(k)] = piece + return newKey +} + +// Keys returns a slice of every key in the TOML data, including key groups. +// Each key is itself a slice, where the first element is the top of the +// hierarchy and the last is the most specific. +// +// The list will have the same order as the keys appeared in the TOML data. +// +// All keys returned are non-empty. +func (md *MetaData) Keys() []Key { + return md.keys +} + +// Undecoded returns all keys that have not been decoded in the order in which +// they appear in the original TOML document. +// +// This includes keys that haven't been decoded because of a Primitive value. +// Once the Primitive value is decoded, the keys will be considered decoded. +// +// Also note that decoding into an empty interface will result in no decoding, +// and so no keys will be considered decoded. +// +// In this sense, the Undecoded keys correspond to keys in the TOML document +// that do not have a concrete type in your representation. +func (md *MetaData) Undecoded() []Key { + undecoded := make([]Key, 0, len(md.keys)) + for _, key := range md.keys { + if !md.decoded[key.String()] { + undecoded = append(undecoded, key) + } + } + return undecoded +} diff --git a/vendor/github.com/BurntSushi/toml/doc.go b/vendor/github.com/BurntSushi/toml/doc.go new file mode 100644 index 000000000000..b371f396edca --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/doc.go @@ -0,0 +1,27 @@ +/* +Package toml provides facilities for decoding and encoding TOML configuration +files via reflection. There is also support for delaying decoding with +the Primitive type, and querying the set of keys in a TOML document with the +MetaData type. + +The specification implemented: https://github.com/toml-lang/toml + +The sub-command github.com/BurntSushi/toml/cmd/tomlv can be used to verify +whether a file is a valid TOML document. It can also be used to print the +type of each key in a TOML document. + +Testing + +There are two important types of tests used for this package. The first is +contained inside '*_test.go' files and uses the standard Go unit testing +framework. These tests are primarily devoted to holistically testing the +decoder and encoder. + +The second type of testing is used to verify the implementation's adherence +to the TOML specification. These tests have been factored into their own +project: https://github.com/BurntSushi/toml-test + +The reason the tests are in a separate project is so that they can be used by +any implementation of TOML. Namely, it is language agnostic. +*/ +package toml diff --git a/vendor/github.com/BurntSushi/toml/encode.go b/vendor/github.com/BurntSushi/toml/encode.go new file mode 100644 index 000000000000..d905c21a2466 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/encode.go @@ -0,0 +1,568 @@ +package toml + +import ( + "bufio" + "errors" + "fmt" + "io" + "reflect" + "sort" + "strconv" + "strings" + "time" +) + +type tomlEncodeError struct{ error } + +var ( + errArrayMixedElementTypes = errors.New( + "toml: cannot encode array with mixed element types") + errArrayNilElement = errors.New( + "toml: cannot encode array with nil element") + errNonString = errors.New( + "toml: cannot encode a map with non-string key type") + errAnonNonStruct = errors.New( + "toml: cannot encode an anonymous field that is not a struct") + errArrayNoTable = errors.New( + "toml: TOML array element cannot contain a table") + errNoKey = errors.New( + "toml: top-level values must be Go maps or structs") + errAnything = errors.New("") // used in testing +) + +var quotedReplacer = strings.NewReplacer( + "\t", "\\t", + "\n", "\\n", + "\r", "\\r", + "\"", "\\\"", + "\\", "\\\\", +) + +// Encoder controls the encoding of Go values to a TOML document to some +// io.Writer. +// +// The indentation level can be controlled with the Indent field. +type Encoder struct { + // A single indentation level. By default it is two spaces. + Indent string + + // hasWritten is whether we have written any output to w yet. + hasWritten bool + w *bufio.Writer +} + +// NewEncoder returns a TOML encoder that encodes Go values to the io.Writer +// given. By default, a single indentation level is 2 spaces. +func NewEncoder(w io.Writer) *Encoder { + return &Encoder{ + w: bufio.NewWriter(w), + Indent: " ", + } +} + +// Encode writes a TOML representation of the Go value to the underlying +// io.Writer. If the value given cannot be encoded to a valid TOML document, +// then an error is returned. +// +// The mapping between Go values and TOML values should be precisely the same +// as for the Decode* functions. Similarly, the TextMarshaler interface is +// supported by encoding the resulting bytes as strings. (If you want to write +// arbitrary binary data then you will need to use something like base64 since +// TOML does not have any binary types.) +// +// When encoding TOML hashes (i.e., Go maps or structs), keys without any +// sub-hashes are encoded first. +// +// If a Go map is encoded, then its keys are sorted alphabetically for +// deterministic output. More control over this behavior may be provided if +// there is demand for it. +// +// Encoding Go values without a corresponding TOML representation---like map +// types with non-string keys---will cause an error to be returned. Similarly +// for mixed arrays/slices, arrays/slices with nil elements, embedded +// non-struct types and nested slices containing maps or structs. +// (e.g., [][]map[string]string is not allowed but []map[string]string is OK +// and so is []map[string][]string.) +func (enc *Encoder) Encode(v interface{}) error { + rv := eindirect(reflect.ValueOf(v)) + if err := enc.safeEncode(Key([]string{}), rv); err != nil { + return err + } + return enc.w.Flush() +} + +func (enc *Encoder) safeEncode(key Key, rv reflect.Value) (err error) { + defer func() { + if r := recover(); r != nil { + if terr, ok := r.(tomlEncodeError); ok { + err = terr.error + return + } + panic(r) + } + }() + enc.encode(key, rv) + return nil +} + +func (enc *Encoder) encode(key Key, rv reflect.Value) { + // Special case. Time needs to be in ISO8601 format. + // Special case. If we can marshal the type to text, then we used that. + // Basically, this prevents the encoder for handling these types as + // generic structs (or whatever the underlying type of a TextMarshaler is). + switch rv.Interface().(type) { + case time.Time, TextMarshaler: + enc.keyEqElement(key, rv) + return + } + + k := rv.Kind() + switch k { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, + reflect.Int64, + reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, + reflect.Uint64, + reflect.Float32, reflect.Float64, reflect.String, reflect.Bool: + enc.keyEqElement(key, rv) + case reflect.Array, reflect.Slice: + if typeEqual(tomlArrayHash, tomlTypeOfGo(rv)) { + enc.eArrayOfTables(key, rv) + } else { + enc.keyEqElement(key, rv) + } + case reflect.Interface: + if rv.IsNil() { + return + } + enc.encode(key, rv.Elem()) + case reflect.Map: + if rv.IsNil() { + return + } + enc.eTable(key, rv) + case reflect.Ptr: + if rv.IsNil() { + return + } + enc.encode(key, rv.Elem()) + case reflect.Struct: + enc.eTable(key, rv) + default: + panic(e("unsupported type for key '%s': %s", key, k)) + } +} + +// eElement encodes any value that can be an array element (primitives and +// arrays). +func (enc *Encoder) eElement(rv reflect.Value) { + switch v := rv.Interface().(type) { + case time.Time: + // Special case time.Time as a primitive. Has to come before + // TextMarshaler below because time.Time implements + // encoding.TextMarshaler, but we need to always use UTC. + enc.wf(v.UTC().Format("2006-01-02T15:04:05Z")) + return + case TextMarshaler: + // Special case. Use text marshaler if it's available for this value. + if s, err := v.MarshalText(); err != nil { + encPanic(err) + } else { + enc.writeQuoted(string(s)) + } + return + } + switch rv.Kind() { + case reflect.Bool: + enc.wf(strconv.FormatBool(rv.Bool())) + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, + reflect.Int64: + enc.wf(strconv.FormatInt(rv.Int(), 10)) + case reflect.Uint, reflect.Uint8, reflect.Uint16, + reflect.Uint32, reflect.Uint64: + enc.wf(strconv.FormatUint(rv.Uint(), 10)) + case reflect.Float32: + enc.wf(floatAddDecimal(strconv.FormatFloat(rv.Float(), 'f', -1, 32))) + case reflect.Float64: + enc.wf(floatAddDecimal(strconv.FormatFloat(rv.Float(), 'f', -1, 64))) + case reflect.Array, reflect.Slice: + enc.eArrayOrSliceElement(rv) + case reflect.Interface: + enc.eElement(rv.Elem()) + case reflect.String: + enc.writeQuoted(rv.String()) + default: + panic(e("unexpected primitive type: %s", rv.Kind())) + } +} + +// By the TOML spec, all floats must have a decimal with at least one +// number on either side. +func floatAddDecimal(fstr string) string { + if !strings.Contains(fstr, ".") { + return fstr + ".0" + } + return fstr +} + +func (enc *Encoder) writeQuoted(s string) { + enc.wf("\"%s\"", quotedReplacer.Replace(s)) +} + +func (enc *Encoder) eArrayOrSliceElement(rv reflect.Value) { + length := rv.Len() + enc.wf("[") + for i := 0; i < length; i++ { + elem := rv.Index(i) + enc.eElement(elem) + if i != length-1 { + enc.wf(", ") + } + } + enc.wf("]") +} + +func (enc *Encoder) eArrayOfTables(key Key, rv reflect.Value) { + if len(key) == 0 { + encPanic(errNoKey) + } + for i := 0; i < rv.Len(); i++ { + trv := rv.Index(i) + if isNil(trv) { + continue + } + panicIfInvalidKey(key) + enc.newline() + enc.wf("%s[[%s]]", enc.indentStr(key), key.maybeQuotedAll()) + enc.newline() + enc.eMapOrStruct(key, trv) + } +} + +func (enc *Encoder) eTable(key Key, rv reflect.Value) { + panicIfInvalidKey(key) + if len(key) == 1 { + // Output an extra newline between top-level tables. + // (The newline isn't written if nothing else has been written though.) + enc.newline() + } + if len(key) > 0 { + enc.wf("%s[%s]", enc.indentStr(key), key.maybeQuotedAll()) + enc.newline() + } + enc.eMapOrStruct(key, rv) +} + +func (enc *Encoder) eMapOrStruct(key Key, rv reflect.Value) { + switch rv := eindirect(rv); rv.Kind() { + case reflect.Map: + enc.eMap(key, rv) + case reflect.Struct: + enc.eStruct(key, rv) + default: + panic("eTable: unhandled reflect.Value Kind: " + rv.Kind().String()) + } +} + +func (enc *Encoder) eMap(key Key, rv reflect.Value) { + rt := rv.Type() + if rt.Key().Kind() != reflect.String { + encPanic(errNonString) + } + + // Sort keys so that we have deterministic output. And write keys directly + // underneath this key first, before writing sub-structs or sub-maps. + var mapKeysDirect, mapKeysSub []string + for _, mapKey := range rv.MapKeys() { + k := mapKey.String() + if typeIsHash(tomlTypeOfGo(rv.MapIndex(mapKey))) { + mapKeysSub = append(mapKeysSub, k) + } else { + mapKeysDirect = append(mapKeysDirect, k) + } + } + + var writeMapKeys = func(mapKeys []string) { + sort.Strings(mapKeys) + for _, mapKey := range mapKeys { + mrv := rv.MapIndex(reflect.ValueOf(mapKey)) + if isNil(mrv) { + // Don't write anything for nil fields. + continue + } + enc.encode(key.add(mapKey), mrv) + } + } + writeMapKeys(mapKeysDirect) + writeMapKeys(mapKeysSub) +} + +func (enc *Encoder) eStruct(key Key, rv reflect.Value) { + // Write keys for fields directly under this key first, because if we write + // a field that creates a new table, then all keys under it will be in that + // table (not the one we're writing here). + rt := rv.Type() + var fieldsDirect, fieldsSub [][]int + var addFields func(rt reflect.Type, rv reflect.Value, start []int) + addFields = func(rt reflect.Type, rv reflect.Value, start []int) { + for i := 0; i < rt.NumField(); i++ { + f := rt.Field(i) + // skip unexported fields + if f.PkgPath != "" && !f.Anonymous { + continue + } + frv := rv.Field(i) + if f.Anonymous { + t := f.Type + switch t.Kind() { + case reflect.Struct: + // Treat anonymous struct fields with + // tag names as though they are not + // anonymous, like encoding/json does. + if getOptions(f.Tag).name == "" { + addFields(t, frv, f.Index) + continue + } + case reflect.Ptr: + if t.Elem().Kind() == reflect.Struct && + getOptions(f.Tag).name == "" { + if !frv.IsNil() { + addFields(t.Elem(), frv.Elem(), f.Index) + } + continue + } + // Fall through to the normal field encoding logic below + // for non-struct anonymous fields. + } + } + + if typeIsHash(tomlTypeOfGo(frv)) { + fieldsSub = append(fieldsSub, append(start, f.Index...)) + } else { + fieldsDirect = append(fieldsDirect, append(start, f.Index...)) + } + } + } + addFields(rt, rv, nil) + + var writeFields = func(fields [][]int) { + for _, fieldIndex := range fields { + sft := rt.FieldByIndex(fieldIndex) + sf := rv.FieldByIndex(fieldIndex) + if isNil(sf) { + // Don't write anything for nil fields. + continue + } + + opts := getOptions(sft.Tag) + if opts.skip { + continue + } + keyName := sft.Name + if opts.name != "" { + keyName = opts.name + } + if opts.omitempty && isEmpty(sf) { + continue + } + if opts.omitzero && isZero(sf) { + continue + } + + enc.encode(key.add(keyName), sf) + } + } + writeFields(fieldsDirect) + writeFields(fieldsSub) +} + +// tomlTypeName returns the TOML type name of the Go value's type. It is +// used to determine whether the types of array elements are mixed (which is +// forbidden). If the Go value is nil, then it is illegal for it to be an array +// element, and valueIsNil is returned as true. + +// Returns the TOML type of a Go value. The type may be `nil`, which means +// no concrete TOML type could be found. +func tomlTypeOfGo(rv reflect.Value) tomlType { + if isNil(rv) || !rv.IsValid() { + return nil + } + switch rv.Kind() { + case reflect.Bool: + return tomlBool + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, + reflect.Int64, + reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, + reflect.Uint64: + return tomlInteger + case reflect.Float32, reflect.Float64: + return tomlFloat + case reflect.Array, reflect.Slice: + if typeEqual(tomlHash, tomlArrayType(rv)) { + return tomlArrayHash + } + return tomlArray + case reflect.Ptr, reflect.Interface: + return tomlTypeOfGo(rv.Elem()) + case reflect.String: + return tomlString + case reflect.Map: + return tomlHash + case reflect.Struct: + switch rv.Interface().(type) { + case time.Time: + return tomlDatetime + case TextMarshaler: + return tomlString + default: + return tomlHash + } + default: + panic("unexpected reflect.Kind: " + rv.Kind().String()) + } +} + +// tomlArrayType returns the element type of a TOML array. The type returned +// may be nil if it cannot be determined (e.g., a nil slice or a zero length +// slize). This function may also panic if it finds a type that cannot be +// expressed in TOML (such as nil elements, heterogeneous arrays or directly +// nested arrays of tables). +func tomlArrayType(rv reflect.Value) tomlType { + if isNil(rv) || !rv.IsValid() || rv.Len() == 0 { + return nil + } + firstType := tomlTypeOfGo(rv.Index(0)) + if firstType == nil { + encPanic(errArrayNilElement) + } + + rvlen := rv.Len() + for i := 1; i < rvlen; i++ { + elem := rv.Index(i) + switch elemType := tomlTypeOfGo(elem); { + case elemType == nil: + encPanic(errArrayNilElement) + case !typeEqual(firstType, elemType): + encPanic(errArrayMixedElementTypes) + } + } + // If we have a nested array, then we must make sure that the nested + // array contains ONLY primitives. + // This checks arbitrarily nested arrays. + if typeEqual(firstType, tomlArray) || typeEqual(firstType, tomlArrayHash) { + nest := tomlArrayType(eindirect(rv.Index(0))) + if typeEqual(nest, tomlHash) || typeEqual(nest, tomlArrayHash) { + encPanic(errArrayNoTable) + } + } + return firstType +} + +type tagOptions struct { + skip bool // "-" + name string + omitempty bool + omitzero bool +} + +func getOptions(tag reflect.StructTag) tagOptions { + t := tag.Get("toml") + if t == "-" { + return tagOptions{skip: true} + } + var opts tagOptions + parts := strings.Split(t, ",") + opts.name = parts[0] + for _, s := range parts[1:] { + switch s { + case "omitempty": + opts.omitempty = true + case "omitzero": + opts.omitzero = true + } + } + return opts +} + +func isZero(rv reflect.Value) bool { + switch rv.Kind() { + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + return rv.Int() == 0 + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: + return rv.Uint() == 0 + case reflect.Float32, reflect.Float64: + return rv.Float() == 0.0 + } + return false +} + +func isEmpty(rv reflect.Value) bool { + switch rv.Kind() { + case reflect.Array, reflect.Slice, reflect.Map, reflect.String: + return rv.Len() == 0 + case reflect.Bool: + return !rv.Bool() + } + return false +} + +func (enc *Encoder) newline() { + if enc.hasWritten { + enc.wf("\n") + } +} + +func (enc *Encoder) keyEqElement(key Key, val reflect.Value) { + if len(key) == 0 { + encPanic(errNoKey) + } + panicIfInvalidKey(key) + enc.wf("%s%s = ", enc.indentStr(key), key.maybeQuoted(len(key)-1)) + enc.eElement(val) + enc.newline() +} + +func (enc *Encoder) wf(format string, v ...interface{}) { + if _, err := fmt.Fprintf(enc.w, format, v...); err != nil { + encPanic(err) + } + enc.hasWritten = true +} + +func (enc *Encoder) indentStr(key Key) string { + return strings.Repeat(enc.Indent, len(key)-1) +} + +func encPanic(err error) { + panic(tomlEncodeError{err}) +} + +func eindirect(v reflect.Value) reflect.Value { + switch v.Kind() { + case reflect.Ptr, reflect.Interface: + return eindirect(v.Elem()) + default: + return v + } +} + +func isNil(rv reflect.Value) bool { + switch rv.Kind() { + case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice: + return rv.IsNil() + default: + return false + } +} + +func panicIfInvalidKey(key Key) { + for _, k := range key { + if len(k) == 0 { + encPanic(e("Key '%s' is not a valid table name. Key names "+ + "cannot be empty.", key.maybeQuotedAll())) + } + } +} + +func isValidKeyName(s string) bool { + return len(s) != 0 +} diff --git a/vendor/github.com/BurntSushi/toml/encoding_types.go b/vendor/github.com/BurntSushi/toml/encoding_types.go new file mode 100644 index 000000000000..d36e1dd6002b --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/encoding_types.go @@ -0,0 +1,19 @@ +// +build go1.2 + +package toml + +// In order to support Go 1.1, we define our own TextMarshaler and +// TextUnmarshaler types. For Go 1.2+, we just alias them with the +// standard library interfaces. + +import ( + "encoding" +) + +// TextMarshaler is a synonym for encoding.TextMarshaler. It is defined here +// so that Go 1.1 can be supported. +type TextMarshaler encoding.TextMarshaler + +// TextUnmarshaler is a synonym for encoding.TextUnmarshaler. It is defined +// here so that Go 1.1 can be supported. +type TextUnmarshaler encoding.TextUnmarshaler diff --git a/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go b/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go new file mode 100644 index 000000000000..e8d503d04690 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go @@ -0,0 +1,18 @@ +// +build !go1.2 + +package toml + +// These interfaces were introduced in Go 1.2, so we add them manually when +// compiling for Go 1.1. + +// TextMarshaler is a synonym for encoding.TextMarshaler. It is defined here +// so that Go 1.1 can be supported. +type TextMarshaler interface { + MarshalText() (text []byte, err error) +} + +// TextUnmarshaler is a synonym for encoding.TextUnmarshaler. It is defined +// here so that Go 1.1 can be supported. +type TextUnmarshaler interface { + UnmarshalText(text []byte) error +} diff --git a/vendor/github.com/BurntSushi/toml/lex.go b/vendor/github.com/BurntSushi/toml/lex.go new file mode 100644 index 000000000000..e0a742a8870f --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/lex.go @@ -0,0 +1,953 @@ +package toml + +import ( + "fmt" + "strings" + "unicode" + "unicode/utf8" +) + +type itemType int + +const ( + itemError itemType = iota + itemNIL // used in the parser to indicate no type + itemEOF + itemText + itemString + itemRawString + itemMultilineString + itemRawMultilineString + itemBool + itemInteger + itemFloat + itemDatetime + itemArray // the start of an array + itemArrayEnd + itemTableStart + itemTableEnd + itemArrayTableStart + itemArrayTableEnd + itemKeyStart + itemCommentStart + itemInlineTableStart + itemInlineTableEnd +) + +const ( + eof = 0 + comma = ',' + tableStart = '[' + tableEnd = ']' + arrayTableStart = '[' + arrayTableEnd = ']' + tableSep = '.' + keySep = '=' + arrayStart = '[' + arrayEnd = ']' + commentStart = '#' + stringStart = '"' + stringEnd = '"' + rawStringStart = '\'' + rawStringEnd = '\'' + inlineTableStart = '{' + inlineTableEnd = '}' +) + +type stateFn func(lx *lexer) stateFn + +type lexer struct { + input string + start int + pos int + line int + state stateFn + items chan item + + // Allow for backing up up to three runes. + // This is necessary because TOML contains 3-rune tokens (""" and '''). + prevWidths [3]int + nprev int // how many of prevWidths are in use + // If we emit an eof, we can still back up, but it is not OK to call + // next again. + atEOF bool + + // A stack of state functions used to maintain context. + // The idea is to reuse parts of the state machine in various places. + // For example, values can appear at the top level or within arbitrarily + // nested arrays. The last state on the stack is used after a value has + // been lexed. Similarly for comments. + stack []stateFn +} + +type item struct { + typ itemType + val string + line int +} + +func (lx *lexer) nextItem() item { + for { + select { + case item := <-lx.items: + return item + default: + lx.state = lx.state(lx) + } + } +} + +func lex(input string) *lexer { + lx := &lexer{ + input: input, + state: lexTop, + line: 1, + items: make(chan item, 10), + stack: make([]stateFn, 0, 10), + } + return lx +} + +func (lx *lexer) push(state stateFn) { + lx.stack = append(lx.stack, state) +} + +func (lx *lexer) pop() stateFn { + if len(lx.stack) == 0 { + return lx.errorf("BUG in lexer: no states to pop") + } + last := lx.stack[len(lx.stack)-1] + lx.stack = lx.stack[0 : len(lx.stack)-1] + return last +} + +func (lx *lexer) current() string { + return lx.input[lx.start:lx.pos] +} + +func (lx *lexer) emit(typ itemType) { + lx.items <- item{typ, lx.current(), lx.line} + lx.start = lx.pos +} + +func (lx *lexer) emitTrim(typ itemType) { + lx.items <- item{typ, strings.TrimSpace(lx.current()), lx.line} + lx.start = lx.pos +} + +func (lx *lexer) next() (r rune) { + if lx.atEOF { + panic("next called after EOF") + } + if lx.pos >= len(lx.input) { + lx.atEOF = true + return eof + } + + if lx.input[lx.pos] == '\n' { + lx.line++ + } + lx.prevWidths[2] = lx.prevWidths[1] + lx.prevWidths[1] = lx.prevWidths[0] + if lx.nprev < 3 { + lx.nprev++ + } + r, w := utf8.DecodeRuneInString(lx.input[lx.pos:]) + lx.prevWidths[0] = w + lx.pos += w + return r +} + +// ignore skips over the pending input before this point. +func (lx *lexer) ignore() { + lx.start = lx.pos +} + +// backup steps back one rune. Can be called only twice between calls to next. +func (lx *lexer) backup() { + if lx.atEOF { + lx.atEOF = false + return + } + if lx.nprev < 1 { + panic("backed up too far") + } + w := lx.prevWidths[0] + lx.prevWidths[0] = lx.prevWidths[1] + lx.prevWidths[1] = lx.prevWidths[2] + lx.nprev-- + lx.pos -= w + if lx.pos < len(lx.input) && lx.input[lx.pos] == '\n' { + lx.line-- + } +} + +// accept consumes the next rune if it's equal to `valid`. +func (lx *lexer) accept(valid rune) bool { + if lx.next() == valid { + return true + } + lx.backup() + return false +} + +// peek returns but does not consume the next rune in the input. +func (lx *lexer) peek() rune { + r := lx.next() + lx.backup() + return r +} + +// skip ignores all input that matches the given predicate. +func (lx *lexer) skip(pred func(rune) bool) { + for { + r := lx.next() + if pred(r) { + continue + } + lx.backup() + lx.ignore() + return + } +} + +// errorf stops all lexing by emitting an error and returning `nil`. +// Note that any value that is a character is escaped if it's a special +// character (newlines, tabs, etc.). +func (lx *lexer) errorf(format string, values ...interface{}) stateFn { + lx.items <- item{ + itemError, + fmt.Sprintf(format, values...), + lx.line, + } + return nil +} + +// lexTop consumes elements at the top level of TOML data. +func lexTop(lx *lexer) stateFn { + r := lx.next() + if isWhitespace(r) || isNL(r) { + return lexSkip(lx, lexTop) + } + switch r { + case commentStart: + lx.push(lexTop) + return lexCommentStart + case tableStart: + return lexTableStart + case eof: + if lx.pos > lx.start { + return lx.errorf("unexpected EOF") + } + lx.emit(itemEOF) + return nil + } + + // At this point, the only valid item can be a key, so we back up + // and let the key lexer do the rest. + lx.backup() + lx.push(lexTopEnd) + return lexKeyStart +} + +// lexTopEnd is entered whenever a top-level item has been consumed. (A value +// or a table.) It must see only whitespace, and will turn back to lexTop +// upon a newline. If it sees EOF, it will quit the lexer successfully. +func lexTopEnd(lx *lexer) stateFn { + r := lx.next() + switch { + case r == commentStart: + // a comment will read to a newline for us. + lx.push(lexTop) + return lexCommentStart + case isWhitespace(r): + return lexTopEnd + case isNL(r): + lx.ignore() + return lexTop + case r == eof: + lx.emit(itemEOF) + return nil + } + return lx.errorf("expected a top-level item to end with a newline, "+ + "comment, or EOF, but got %q instead", r) +} + +// lexTable lexes the beginning of a table. Namely, it makes sure that +// it starts with a character other than '.' and ']'. +// It assumes that '[' has already been consumed. +// It also handles the case that this is an item in an array of tables. +// e.g., '[[name]]'. +func lexTableStart(lx *lexer) stateFn { + if lx.peek() == arrayTableStart { + lx.next() + lx.emit(itemArrayTableStart) + lx.push(lexArrayTableEnd) + } else { + lx.emit(itemTableStart) + lx.push(lexTableEnd) + } + return lexTableNameStart +} + +func lexTableEnd(lx *lexer) stateFn { + lx.emit(itemTableEnd) + return lexTopEnd +} + +func lexArrayTableEnd(lx *lexer) stateFn { + if r := lx.next(); r != arrayTableEnd { + return lx.errorf("expected end of table array name delimiter %q, "+ + "but got %q instead", arrayTableEnd, r) + } + lx.emit(itemArrayTableEnd) + return lexTopEnd +} + +func lexTableNameStart(lx *lexer) stateFn { + lx.skip(isWhitespace) + switch r := lx.peek(); { + case r == tableEnd || r == eof: + return lx.errorf("unexpected end of table name " + + "(table names cannot be empty)") + case r == tableSep: + return lx.errorf("unexpected table separator " + + "(table names cannot be empty)") + case r == stringStart || r == rawStringStart: + lx.ignore() + lx.push(lexTableNameEnd) + return lexValue // reuse string lexing + default: + return lexBareTableName + } +} + +// lexBareTableName lexes the name of a table. It assumes that at least one +// valid character for the table has already been read. +func lexBareTableName(lx *lexer) stateFn { + r := lx.next() + if isBareKeyChar(r) { + return lexBareTableName + } + lx.backup() + lx.emit(itemText) + return lexTableNameEnd +} + +// lexTableNameEnd reads the end of a piece of a table name, optionally +// consuming whitespace. +func lexTableNameEnd(lx *lexer) stateFn { + lx.skip(isWhitespace) + switch r := lx.next(); { + case isWhitespace(r): + return lexTableNameEnd + case r == tableSep: + lx.ignore() + return lexTableNameStart + case r == tableEnd: + return lx.pop() + default: + return lx.errorf("expected '.' or ']' to end table name, "+ + "but got %q instead", r) + } +} + +// lexKeyStart consumes a key name up until the first non-whitespace character. +// lexKeyStart will ignore whitespace. +func lexKeyStart(lx *lexer) stateFn { + r := lx.peek() + switch { + case r == keySep: + return lx.errorf("unexpected key separator %q", keySep) + case isWhitespace(r) || isNL(r): + lx.next() + return lexSkip(lx, lexKeyStart) + case r == stringStart || r == rawStringStart: + lx.ignore() + lx.emit(itemKeyStart) + lx.push(lexKeyEnd) + return lexValue // reuse string lexing + default: + lx.ignore() + lx.emit(itemKeyStart) + return lexBareKey + } +} + +// lexBareKey consumes the text of a bare key. Assumes that the first character +// (which is not whitespace) has not yet been consumed. +func lexBareKey(lx *lexer) stateFn { + switch r := lx.next(); { + case isBareKeyChar(r): + return lexBareKey + case isWhitespace(r): + lx.backup() + lx.emit(itemText) + return lexKeyEnd + case r == keySep: + lx.backup() + lx.emit(itemText) + return lexKeyEnd + default: + return lx.errorf("bare keys cannot contain %q", r) + } +} + +// lexKeyEnd consumes the end of a key and trims whitespace (up to the key +// separator). +func lexKeyEnd(lx *lexer) stateFn { + switch r := lx.next(); { + case r == keySep: + return lexSkip(lx, lexValue) + case isWhitespace(r): + return lexSkip(lx, lexKeyEnd) + default: + return lx.errorf("expected key separator %q, but got %q instead", + keySep, r) + } +} + +// lexValue starts the consumption of a value anywhere a value is expected. +// lexValue will ignore whitespace. +// After a value is lexed, the last state on the next is popped and returned. +func lexValue(lx *lexer) stateFn { + // We allow whitespace to precede a value, but NOT newlines. + // In array syntax, the array states are responsible for ignoring newlines. + r := lx.next() + switch { + case isWhitespace(r): + return lexSkip(lx, lexValue) + case isDigit(r): + lx.backup() // avoid an extra state and use the same as above + return lexNumberOrDateStart + } + switch r { + case arrayStart: + lx.ignore() + lx.emit(itemArray) + return lexArrayValue + case inlineTableStart: + lx.ignore() + lx.emit(itemInlineTableStart) + return lexInlineTableValue + case stringStart: + if lx.accept(stringStart) { + if lx.accept(stringStart) { + lx.ignore() // Ignore """ + return lexMultilineString + } + lx.backup() + } + lx.ignore() // ignore the '"' + return lexString + case rawStringStart: + if lx.accept(rawStringStart) { + if lx.accept(rawStringStart) { + lx.ignore() // Ignore """ + return lexMultilineRawString + } + lx.backup() + } + lx.ignore() // ignore the "'" + return lexRawString + case '+', '-': + return lexNumberStart + case '.': // special error case, be kind to users + return lx.errorf("floats must start with a digit, not '.'") + } + if unicode.IsLetter(r) { + // Be permissive here; lexBool will give a nice error if the + // user wrote something like + // x = foo + // (i.e. not 'true' or 'false' but is something else word-like.) + lx.backup() + return lexBool + } + return lx.errorf("expected value but found %q instead", r) +} + +// lexArrayValue consumes one value in an array. It assumes that '[' or ',' +// have already been consumed. All whitespace and newlines are ignored. +func lexArrayValue(lx *lexer) stateFn { + r := lx.next() + switch { + case isWhitespace(r) || isNL(r): + return lexSkip(lx, lexArrayValue) + case r == commentStart: + lx.push(lexArrayValue) + return lexCommentStart + case r == comma: + return lx.errorf("unexpected comma") + case r == arrayEnd: + // NOTE(caleb): The spec isn't clear about whether you can have + // a trailing comma or not, so we'll allow it. + return lexArrayEnd + } + + lx.backup() + lx.push(lexArrayValueEnd) + return lexValue +} + +// lexArrayValueEnd consumes everything between the end of an array value and +// the next value (or the end of the array): it ignores whitespace and newlines +// and expects either a ',' or a ']'. +func lexArrayValueEnd(lx *lexer) stateFn { + r := lx.next() + switch { + case isWhitespace(r) || isNL(r): + return lexSkip(lx, lexArrayValueEnd) + case r == commentStart: + lx.push(lexArrayValueEnd) + return lexCommentStart + case r == comma: + lx.ignore() + return lexArrayValue // move on to the next value + case r == arrayEnd: + return lexArrayEnd + } + return lx.errorf( + "expected a comma or array terminator %q, but got %q instead", + arrayEnd, r, + ) +} + +// lexArrayEnd finishes the lexing of an array. +// It assumes that a ']' has just been consumed. +func lexArrayEnd(lx *lexer) stateFn { + lx.ignore() + lx.emit(itemArrayEnd) + return lx.pop() +} + +// lexInlineTableValue consumes one key/value pair in an inline table. +// It assumes that '{' or ',' have already been consumed. Whitespace is ignored. +func lexInlineTableValue(lx *lexer) stateFn { + r := lx.next() + switch { + case isWhitespace(r): + return lexSkip(lx, lexInlineTableValue) + case isNL(r): + return lx.errorf("newlines not allowed within inline tables") + case r == commentStart: + lx.push(lexInlineTableValue) + return lexCommentStart + case r == comma: + return lx.errorf("unexpected comma") + case r == inlineTableEnd: + return lexInlineTableEnd + } + lx.backup() + lx.push(lexInlineTableValueEnd) + return lexKeyStart +} + +// lexInlineTableValueEnd consumes everything between the end of an inline table +// key/value pair and the next pair (or the end of the table): +// it ignores whitespace and expects either a ',' or a '}'. +func lexInlineTableValueEnd(lx *lexer) stateFn { + r := lx.next() + switch { + case isWhitespace(r): + return lexSkip(lx, lexInlineTableValueEnd) + case isNL(r): + return lx.errorf("newlines not allowed within inline tables") + case r == commentStart: + lx.push(lexInlineTableValueEnd) + return lexCommentStart + case r == comma: + lx.ignore() + return lexInlineTableValue + case r == inlineTableEnd: + return lexInlineTableEnd + } + return lx.errorf("expected a comma or an inline table terminator %q, "+ + "but got %q instead", inlineTableEnd, r) +} + +// lexInlineTableEnd finishes the lexing of an inline table. +// It assumes that a '}' has just been consumed. +func lexInlineTableEnd(lx *lexer) stateFn { + lx.ignore() + lx.emit(itemInlineTableEnd) + return lx.pop() +} + +// lexString consumes the inner contents of a string. It assumes that the +// beginning '"' has already been consumed and ignored. +func lexString(lx *lexer) stateFn { + r := lx.next() + switch { + case r == eof: + return lx.errorf("unexpected EOF") + case isNL(r): + return lx.errorf("strings cannot contain newlines") + case r == '\\': + lx.push(lexString) + return lexStringEscape + case r == stringEnd: + lx.backup() + lx.emit(itemString) + lx.next() + lx.ignore() + return lx.pop() + } + return lexString +} + +// lexMultilineString consumes the inner contents of a string. It assumes that +// the beginning '"""' has already been consumed and ignored. +func lexMultilineString(lx *lexer) stateFn { + switch lx.next() { + case eof: + return lx.errorf("unexpected EOF") + case '\\': + return lexMultilineStringEscape + case stringEnd: + if lx.accept(stringEnd) { + if lx.accept(stringEnd) { + lx.backup() + lx.backup() + lx.backup() + lx.emit(itemMultilineString) + lx.next() + lx.next() + lx.next() + lx.ignore() + return lx.pop() + } + lx.backup() + } + } + return lexMultilineString +} + +// lexRawString consumes a raw string. Nothing can be escaped in such a string. +// It assumes that the beginning "'" has already been consumed and ignored. +func lexRawString(lx *lexer) stateFn { + r := lx.next() + switch { + case r == eof: + return lx.errorf("unexpected EOF") + case isNL(r): + return lx.errorf("strings cannot contain newlines") + case r == rawStringEnd: + lx.backup() + lx.emit(itemRawString) + lx.next() + lx.ignore() + return lx.pop() + } + return lexRawString +} + +// lexMultilineRawString consumes a raw string. Nothing can be escaped in such +// a string. It assumes that the beginning "'''" has already been consumed and +// ignored. +func lexMultilineRawString(lx *lexer) stateFn { + switch lx.next() { + case eof: + return lx.errorf("unexpected EOF") + case rawStringEnd: + if lx.accept(rawStringEnd) { + if lx.accept(rawStringEnd) { + lx.backup() + lx.backup() + lx.backup() + lx.emit(itemRawMultilineString) + lx.next() + lx.next() + lx.next() + lx.ignore() + return lx.pop() + } + lx.backup() + } + } + return lexMultilineRawString +} + +// lexMultilineStringEscape consumes an escaped character. It assumes that the +// preceding '\\' has already been consumed. +func lexMultilineStringEscape(lx *lexer) stateFn { + // Handle the special case first: + if isNL(lx.next()) { + return lexMultilineString + } + lx.backup() + lx.push(lexMultilineString) + return lexStringEscape(lx) +} + +func lexStringEscape(lx *lexer) stateFn { + r := lx.next() + switch r { + case 'b': + fallthrough + case 't': + fallthrough + case 'n': + fallthrough + case 'f': + fallthrough + case 'r': + fallthrough + case '"': + fallthrough + case '\\': + return lx.pop() + case 'u': + return lexShortUnicodeEscape + case 'U': + return lexLongUnicodeEscape + } + return lx.errorf("invalid escape character %q; only the following "+ + "escape characters are allowed: "+ + `\b, \t, \n, \f, \r, \", \\, \uXXXX, and \UXXXXXXXX`, r) +} + +func lexShortUnicodeEscape(lx *lexer) stateFn { + var r rune + for i := 0; i < 4; i++ { + r = lx.next() + if !isHexadecimal(r) { + return lx.errorf(`expected four hexadecimal digits after '\u', `+ + "but got %q instead", lx.current()) + } + } + return lx.pop() +} + +func lexLongUnicodeEscape(lx *lexer) stateFn { + var r rune + for i := 0; i < 8; i++ { + r = lx.next() + if !isHexadecimal(r) { + return lx.errorf(`expected eight hexadecimal digits after '\U', `+ + "but got %q instead", lx.current()) + } + } + return lx.pop() +} + +// lexNumberOrDateStart consumes either an integer, a float, or datetime. +func lexNumberOrDateStart(lx *lexer) stateFn { + r := lx.next() + if isDigit(r) { + return lexNumberOrDate + } + switch r { + case '_': + return lexNumber + case 'e', 'E': + return lexFloat + case '.': + return lx.errorf("floats must start with a digit, not '.'") + } + return lx.errorf("expected a digit but got %q", r) +} + +// lexNumberOrDate consumes either an integer, float or datetime. +func lexNumberOrDate(lx *lexer) stateFn { + r := lx.next() + if isDigit(r) { + return lexNumberOrDate + } + switch r { + case '-': + return lexDatetime + case '_': + return lexNumber + case '.', 'e', 'E': + return lexFloat + } + + lx.backup() + lx.emit(itemInteger) + return lx.pop() +} + +// lexDatetime consumes a Datetime, to a first approximation. +// The parser validates that it matches one of the accepted formats. +func lexDatetime(lx *lexer) stateFn { + r := lx.next() + if isDigit(r) { + return lexDatetime + } + switch r { + case '-', 'T', ':', '.', 'Z', '+': + return lexDatetime + } + + lx.backup() + lx.emit(itemDatetime) + return lx.pop() +} + +// lexNumberStart consumes either an integer or a float. It assumes that a sign +// has already been read, but that *no* digits have been consumed. +// lexNumberStart will move to the appropriate integer or float states. +func lexNumberStart(lx *lexer) stateFn { + // We MUST see a digit. Even floats have to start with a digit. + r := lx.next() + if !isDigit(r) { + if r == '.' { + return lx.errorf("floats must start with a digit, not '.'") + } + return lx.errorf("expected a digit but got %q", r) + } + return lexNumber +} + +// lexNumber consumes an integer or a float after seeing the first digit. +func lexNumber(lx *lexer) stateFn { + r := lx.next() + if isDigit(r) { + return lexNumber + } + switch r { + case '_': + return lexNumber + case '.', 'e', 'E': + return lexFloat + } + + lx.backup() + lx.emit(itemInteger) + return lx.pop() +} + +// lexFloat consumes the elements of a float. It allows any sequence of +// float-like characters, so floats emitted by the lexer are only a first +// approximation and must be validated by the parser. +func lexFloat(lx *lexer) stateFn { + r := lx.next() + if isDigit(r) { + return lexFloat + } + switch r { + case '_', '.', '-', '+', 'e', 'E': + return lexFloat + } + + lx.backup() + lx.emit(itemFloat) + return lx.pop() +} + +// lexBool consumes a bool string: 'true' or 'false. +func lexBool(lx *lexer) stateFn { + var rs []rune + for { + r := lx.next() + if !unicode.IsLetter(r) { + lx.backup() + break + } + rs = append(rs, r) + } + s := string(rs) + switch s { + case "true", "false": + lx.emit(itemBool) + return lx.pop() + } + return lx.errorf("expected value but found %q instead", s) +} + +// lexCommentStart begins the lexing of a comment. It will emit +// itemCommentStart and consume no characters, passing control to lexComment. +func lexCommentStart(lx *lexer) stateFn { + lx.ignore() + lx.emit(itemCommentStart) + return lexComment +} + +// lexComment lexes an entire comment. It assumes that '#' has been consumed. +// It will consume *up to* the first newline character, and pass control +// back to the last state on the stack. +func lexComment(lx *lexer) stateFn { + r := lx.peek() + if isNL(r) || r == eof { + lx.emit(itemText) + return lx.pop() + } + lx.next() + return lexComment +} + +// lexSkip ignores all slurped input and moves on to the next state. +func lexSkip(lx *lexer, nextState stateFn) stateFn { + return func(lx *lexer) stateFn { + lx.ignore() + return nextState + } +} + +// isWhitespace returns true if `r` is a whitespace character according +// to the spec. +func isWhitespace(r rune) bool { + return r == '\t' || r == ' ' +} + +func isNL(r rune) bool { + return r == '\n' || r == '\r' +} + +func isDigit(r rune) bool { + return r >= '0' && r <= '9' +} + +func isHexadecimal(r rune) bool { + return (r >= '0' && r <= '9') || + (r >= 'a' && r <= 'f') || + (r >= 'A' && r <= 'F') +} + +func isBareKeyChar(r rune) bool { + return (r >= 'A' && r <= 'Z') || + (r >= 'a' && r <= 'z') || + (r >= '0' && r <= '9') || + r == '_' || + r == '-' +} + +func (itype itemType) String() string { + switch itype { + case itemError: + return "Error" + case itemNIL: + return "NIL" + case itemEOF: + return "EOF" + case itemText: + return "Text" + case itemString, itemRawString, itemMultilineString, itemRawMultilineString: + return "String" + case itemBool: + return "Bool" + case itemInteger: + return "Integer" + case itemFloat: + return "Float" + case itemDatetime: + return "DateTime" + case itemTableStart: + return "TableStart" + case itemTableEnd: + return "TableEnd" + case itemKeyStart: + return "KeyStart" + case itemArray: + return "Array" + case itemArrayEnd: + return "ArrayEnd" + case itemCommentStart: + return "CommentStart" + } + panic(fmt.Sprintf("BUG: Unknown type '%d'.", int(itype))) +} + +func (item item) String() string { + return fmt.Sprintf("(%s, %s)", item.typ.String(), item.val) +} diff --git a/vendor/github.com/BurntSushi/toml/parse.go b/vendor/github.com/BurntSushi/toml/parse.go new file mode 100644 index 000000000000..50869ef9266e --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/parse.go @@ -0,0 +1,592 @@ +package toml + +import ( + "fmt" + "strconv" + "strings" + "time" + "unicode" + "unicode/utf8" +) + +type parser struct { + mapping map[string]interface{} + types map[string]tomlType + lx *lexer + + // A list of keys in the order that they appear in the TOML data. + ordered []Key + + // the full key for the current hash in scope + context Key + + // the base key name for everything except hashes + currentKey string + + // rough approximation of line number + approxLine int + + // A map of 'key.group.names' to whether they were created implicitly. + implicits map[string]bool +} + +type parseError string + +func (pe parseError) Error() string { + return string(pe) +} + +func parse(data string) (p *parser, err error) { + defer func() { + if r := recover(); r != nil { + var ok bool + if err, ok = r.(parseError); ok { + return + } + panic(r) + } + }() + + p = &parser{ + mapping: make(map[string]interface{}), + types: make(map[string]tomlType), + lx: lex(data), + ordered: make([]Key, 0), + implicits: make(map[string]bool), + } + for { + item := p.next() + if item.typ == itemEOF { + break + } + p.topLevel(item) + } + + return p, nil +} + +func (p *parser) panicf(format string, v ...interface{}) { + msg := fmt.Sprintf("Near line %d (last key parsed '%s'): %s", + p.approxLine, p.current(), fmt.Sprintf(format, v...)) + panic(parseError(msg)) +} + +func (p *parser) next() item { + it := p.lx.nextItem() + if it.typ == itemError { + p.panicf("%s", it.val) + } + return it +} + +func (p *parser) bug(format string, v ...interface{}) { + panic(fmt.Sprintf("BUG: "+format+"\n\n", v...)) +} + +func (p *parser) expect(typ itemType) item { + it := p.next() + p.assertEqual(typ, it.typ) + return it +} + +func (p *parser) assertEqual(expected, got itemType) { + if expected != got { + p.bug("Expected '%s' but got '%s'.", expected, got) + } +} + +func (p *parser) topLevel(item item) { + switch item.typ { + case itemCommentStart: + p.approxLine = item.line + p.expect(itemText) + case itemTableStart: + kg := p.next() + p.approxLine = kg.line + + var key Key + for ; kg.typ != itemTableEnd && kg.typ != itemEOF; kg = p.next() { + key = append(key, p.keyString(kg)) + } + p.assertEqual(itemTableEnd, kg.typ) + + p.establishContext(key, false) + p.setType("", tomlHash) + p.ordered = append(p.ordered, key) + case itemArrayTableStart: + kg := p.next() + p.approxLine = kg.line + + var key Key + for ; kg.typ != itemArrayTableEnd && kg.typ != itemEOF; kg = p.next() { + key = append(key, p.keyString(kg)) + } + p.assertEqual(itemArrayTableEnd, kg.typ) + + p.establishContext(key, true) + p.setType("", tomlArrayHash) + p.ordered = append(p.ordered, key) + case itemKeyStart: + kname := p.next() + p.approxLine = kname.line + p.currentKey = p.keyString(kname) + + val, typ := p.value(p.next()) + p.setValue(p.currentKey, val) + p.setType(p.currentKey, typ) + p.ordered = append(p.ordered, p.context.add(p.currentKey)) + p.currentKey = "" + default: + p.bug("Unexpected type at top level: %s", item.typ) + } +} + +// Gets a string for a key (or part of a key in a table name). +func (p *parser) keyString(it item) string { + switch it.typ { + case itemText: + return it.val + case itemString, itemMultilineString, + itemRawString, itemRawMultilineString: + s, _ := p.value(it) + return s.(string) + default: + p.bug("Unexpected key type: %s", it.typ) + panic("unreachable") + } +} + +// value translates an expected value from the lexer into a Go value wrapped +// as an empty interface. +func (p *parser) value(it item) (interface{}, tomlType) { + switch it.typ { + case itemString: + return p.replaceEscapes(it.val), p.typeOfPrimitive(it) + case itemMultilineString: + trimmed := stripFirstNewline(stripEscapedWhitespace(it.val)) + return p.replaceEscapes(trimmed), p.typeOfPrimitive(it) + case itemRawString: + return it.val, p.typeOfPrimitive(it) + case itemRawMultilineString: + return stripFirstNewline(it.val), p.typeOfPrimitive(it) + case itemBool: + switch it.val { + case "true": + return true, p.typeOfPrimitive(it) + case "false": + return false, p.typeOfPrimitive(it) + } + p.bug("Expected boolean value, but got '%s'.", it.val) + case itemInteger: + if !numUnderscoresOK(it.val) { + p.panicf("Invalid integer %q: underscores must be surrounded by digits", + it.val) + } + val := strings.Replace(it.val, "_", "", -1) + num, err := strconv.ParseInt(val, 10, 64) + if err != nil { + // Distinguish integer values. Normally, it'd be a bug if the lexer + // provides an invalid integer, but it's possible that the number is + // out of range of valid values (which the lexer cannot determine). + // So mark the former as a bug but the latter as a legitimate user + // error. + if e, ok := err.(*strconv.NumError); ok && + e.Err == strconv.ErrRange { + + p.panicf("Integer '%s' is out of the range of 64-bit "+ + "signed integers.", it.val) + } else { + p.bug("Expected integer value, but got '%s'.", it.val) + } + } + return num, p.typeOfPrimitive(it) + case itemFloat: + parts := strings.FieldsFunc(it.val, func(r rune) bool { + switch r { + case '.', 'e', 'E': + return true + } + return false + }) + for _, part := range parts { + if !numUnderscoresOK(part) { + p.panicf("Invalid float %q: underscores must be "+ + "surrounded by digits", it.val) + } + } + if !numPeriodsOK(it.val) { + // As a special case, numbers like '123.' or '1.e2', + // which are valid as far as Go/strconv are concerned, + // must be rejected because TOML says that a fractional + // part consists of '.' followed by 1+ digits. + p.panicf("Invalid float %q: '.' must be followed "+ + "by one or more digits", it.val) + } + val := strings.Replace(it.val, "_", "", -1) + num, err := strconv.ParseFloat(val, 64) + if err != nil { + if e, ok := err.(*strconv.NumError); ok && + e.Err == strconv.ErrRange { + + p.panicf("Float '%s' is out of the range of 64-bit "+ + "IEEE-754 floating-point numbers.", it.val) + } else { + p.panicf("Invalid float value: %q", it.val) + } + } + return num, p.typeOfPrimitive(it) + case itemDatetime: + var t time.Time + var ok bool + var err error + for _, format := range []string{ + "2006-01-02T15:04:05Z07:00", + "2006-01-02T15:04:05", + "2006-01-02", + } { + t, err = time.ParseInLocation(format, it.val, time.Local) + if err == nil { + ok = true + break + } + } + if !ok { + p.panicf("Invalid TOML Datetime: %q.", it.val) + } + return t, p.typeOfPrimitive(it) + case itemArray: + array := make([]interface{}, 0) + types := make([]tomlType, 0) + + for it = p.next(); it.typ != itemArrayEnd; it = p.next() { + if it.typ == itemCommentStart { + p.expect(itemText) + continue + } + + val, typ := p.value(it) + array = append(array, val) + types = append(types, typ) + } + return array, p.typeOfArray(types) + case itemInlineTableStart: + var ( + hash = make(map[string]interface{}) + outerContext = p.context + outerKey = p.currentKey + ) + + p.context = append(p.context, p.currentKey) + p.currentKey = "" + for it := p.next(); it.typ != itemInlineTableEnd; it = p.next() { + if it.typ != itemKeyStart { + p.bug("Expected key start but instead found %q, around line %d", + it.val, p.approxLine) + } + if it.typ == itemCommentStart { + p.expect(itemText) + continue + } + + // retrieve key + k := p.next() + p.approxLine = k.line + kname := p.keyString(k) + + // retrieve value + p.currentKey = kname + val, typ := p.value(p.next()) + // make sure we keep metadata up to date + p.setType(kname, typ) + p.ordered = append(p.ordered, p.context.add(p.currentKey)) + hash[kname] = val + } + p.context = outerContext + p.currentKey = outerKey + return hash, tomlHash + } + p.bug("Unexpected value type: %s", it.typ) + panic("unreachable") +} + +// numUnderscoresOK checks whether each underscore in s is surrounded by +// characters that are not underscores. +func numUnderscoresOK(s string) bool { + accept := false + for _, r := range s { + if r == '_' { + if !accept { + return false + } + accept = false + continue + } + accept = true + } + return accept +} + +// numPeriodsOK checks whether every period in s is followed by a digit. +func numPeriodsOK(s string) bool { + period := false + for _, r := range s { + if period && !isDigit(r) { + return false + } + period = r == '.' + } + return !period +} + +// establishContext sets the current context of the parser, +// where the context is either a hash or an array of hashes. Which one is +// set depends on the value of the `array` parameter. +// +// Establishing the context also makes sure that the key isn't a duplicate, and +// will create implicit hashes automatically. +func (p *parser) establishContext(key Key, array bool) { + var ok bool + + // Always start at the top level and drill down for our context. + hashContext := p.mapping + keyContext := make(Key, 0) + + // We only need implicit hashes for key[0:-1] + for _, k := range key[0 : len(key)-1] { + _, ok = hashContext[k] + keyContext = append(keyContext, k) + + // No key? Make an implicit hash and move on. + if !ok { + p.addImplicit(keyContext) + hashContext[k] = make(map[string]interface{}) + } + + // If the hash context is actually an array of tables, then set + // the hash context to the last element in that array. + // + // Otherwise, it better be a table, since this MUST be a key group (by + // virtue of it not being the last element in a key). + switch t := hashContext[k].(type) { + case []map[string]interface{}: + hashContext = t[len(t)-1] + case map[string]interface{}: + hashContext = t + default: + p.panicf("Key '%s' was already created as a hash.", keyContext) + } + } + + p.context = keyContext + if array { + // If this is the first element for this array, then allocate a new + // list of tables for it. + k := key[len(key)-1] + if _, ok := hashContext[k]; !ok { + hashContext[k] = make([]map[string]interface{}, 0, 5) + } + + // Add a new table. But make sure the key hasn't already been used + // for something else. + if hash, ok := hashContext[k].([]map[string]interface{}); ok { + hashContext[k] = append(hash, make(map[string]interface{})) + } else { + p.panicf("Key '%s' was already created and cannot be used as "+ + "an array.", keyContext) + } + } else { + p.setValue(key[len(key)-1], make(map[string]interface{})) + } + p.context = append(p.context, key[len(key)-1]) +} + +// setValue sets the given key to the given value in the current context. +// It will make sure that the key hasn't already been defined, account for +// implicit key groups. +func (p *parser) setValue(key string, value interface{}) { + var tmpHash interface{} + var ok bool + + hash := p.mapping + keyContext := make(Key, 0) + for _, k := range p.context { + keyContext = append(keyContext, k) + if tmpHash, ok = hash[k]; !ok { + p.bug("Context for key '%s' has not been established.", keyContext) + } + switch t := tmpHash.(type) { + case []map[string]interface{}: + // The context is a table of hashes. Pick the most recent table + // defined as the current hash. + hash = t[len(t)-1] + case map[string]interface{}: + hash = t + default: + p.bug("Expected hash to have type 'map[string]interface{}', but "+ + "it has '%T' instead.", tmpHash) + } + } + keyContext = append(keyContext, key) + + if _, ok := hash[key]; ok { + // Typically, if the given key has already been set, then we have + // to raise an error since duplicate keys are disallowed. However, + // it's possible that a key was previously defined implicitly. In this + // case, it is allowed to be redefined concretely. (See the + // `tests/valid/implicit-and-explicit-after.toml` test in `toml-test`.) + // + // But we have to make sure to stop marking it as an implicit. (So that + // another redefinition provokes an error.) + // + // Note that since it has already been defined (as a hash), we don't + // want to overwrite it. So our business is done. + if p.isImplicit(keyContext) { + p.removeImplicit(keyContext) + return + } + + // Otherwise, we have a concrete key trying to override a previous + // key, which is *always* wrong. + p.panicf("Key '%s' has already been defined.", keyContext) + } + hash[key] = value +} + +// setType sets the type of a particular value at a given key. +// It should be called immediately AFTER setValue. +// +// Note that if `key` is empty, then the type given will be applied to the +// current context (which is either a table or an array of tables). +func (p *parser) setType(key string, typ tomlType) { + keyContext := make(Key, 0, len(p.context)+1) + for _, k := range p.context { + keyContext = append(keyContext, k) + } + if len(key) > 0 { // allow type setting for hashes + keyContext = append(keyContext, key) + } + p.types[keyContext.String()] = typ +} + +// addImplicit sets the given Key as having been created implicitly. +func (p *parser) addImplicit(key Key) { + p.implicits[key.String()] = true +} + +// removeImplicit stops tagging the given key as having been implicitly +// created. +func (p *parser) removeImplicit(key Key) { + p.implicits[key.String()] = false +} + +// isImplicit returns true if the key group pointed to by the key was created +// implicitly. +func (p *parser) isImplicit(key Key) bool { + return p.implicits[key.String()] +} + +// current returns the full key name of the current context. +func (p *parser) current() string { + if len(p.currentKey) == 0 { + return p.context.String() + } + if len(p.context) == 0 { + return p.currentKey + } + return fmt.Sprintf("%s.%s", p.context, p.currentKey) +} + +func stripFirstNewline(s string) string { + if len(s) == 0 || s[0] != '\n' { + return s + } + return s[1:] +} + +func stripEscapedWhitespace(s string) string { + esc := strings.Split(s, "\\\n") + if len(esc) > 1 { + for i := 1; i < len(esc); i++ { + esc[i] = strings.TrimLeftFunc(esc[i], unicode.IsSpace) + } + } + return strings.Join(esc, "") +} + +func (p *parser) replaceEscapes(str string) string { + var replaced []rune + s := []byte(str) + r := 0 + for r < len(s) { + if s[r] != '\\' { + c, size := utf8.DecodeRune(s[r:]) + r += size + replaced = append(replaced, c) + continue + } + r += 1 + if r >= len(s) { + p.bug("Escape sequence at end of string.") + return "" + } + switch s[r] { + default: + p.bug("Expected valid escape code after \\, but got %q.", s[r]) + return "" + case 'b': + replaced = append(replaced, rune(0x0008)) + r += 1 + case 't': + replaced = append(replaced, rune(0x0009)) + r += 1 + case 'n': + replaced = append(replaced, rune(0x000A)) + r += 1 + case 'f': + replaced = append(replaced, rune(0x000C)) + r += 1 + case 'r': + replaced = append(replaced, rune(0x000D)) + r += 1 + case '"': + replaced = append(replaced, rune(0x0022)) + r += 1 + case '\\': + replaced = append(replaced, rune(0x005C)) + r += 1 + case 'u': + // At this point, we know we have a Unicode escape of the form + // `uXXXX` at [r, r+5). (Because the lexer guarantees this + // for us.) + escaped := p.asciiEscapeToUnicode(s[r+1 : r+5]) + replaced = append(replaced, escaped) + r += 5 + case 'U': + // At this point, we know we have a Unicode escape of the form + // `uXXXX` at [r, r+9). (Because the lexer guarantees this + // for us.) + escaped := p.asciiEscapeToUnicode(s[r+1 : r+9]) + replaced = append(replaced, escaped) + r += 9 + } + } + return string(replaced) +} + +func (p *parser) asciiEscapeToUnicode(bs []byte) rune { + s := string(bs) + hex, err := strconv.ParseUint(strings.ToLower(s), 16, 32) + if err != nil { + p.bug("Could not parse '%s' as a hexadecimal number, but the "+ + "lexer claims it's OK: %s", s, err) + } + if !utf8.ValidRune(rune(hex)) { + p.panicf("Escaped character '\\u%s' is not valid UTF-8.", s) + } + return rune(hex) +} + +func isStringType(ty itemType) bool { + return ty == itemString || ty == itemMultilineString || + ty == itemRawString || ty == itemRawMultilineString +} diff --git a/vendor/github.com/BurntSushi/toml/session.vim b/vendor/github.com/BurntSushi/toml/session.vim new file mode 100644 index 000000000000..562164be0603 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/session.vim @@ -0,0 +1 @@ +au BufWritePost *.go silent!make tags > /dev/null 2>&1 diff --git a/vendor/github.com/BurntSushi/toml/type_check.go b/vendor/github.com/BurntSushi/toml/type_check.go new file mode 100644 index 000000000000..c73f8afc1a6d --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/type_check.go @@ -0,0 +1,91 @@ +package toml + +// tomlType represents any Go type that corresponds to a TOML type. +// While the first draft of the TOML spec has a simplistic type system that +// probably doesn't need this level of sophistication, we seem to be militating +// toward adding real composite types. +type tomlType interface { + typeString() string +} + +// typeEqual accepts any two types and returns true if they are equal. +func typeEqual(t1, t2 tomlType) bool { + if t1 == nil || t2 == nil { + return false + } + return t1.typeString() == t2.typeString() +} + +func typeIsHash(t tomlType) bool { + return typeEqual(t, tomlHash) || typeEqual(t, tomlArrayHash) +} + +type tomlBaseType string + +func (btype tomlBaseType) typeString() string { + return string(btype) +} + +func (btype tomlBaseType) String() string { + return btype.typeString() +} + +var ( + tomlInteger tomlBaseType = "Integer" + tomlFloat tomlBaseType = "Float" + tomlDatetime tomlBaseType = "Datetime" + tomlString tomlBaseType = "String" + tomlBool tomlBaseType = "Bool" + tomlArray tomlBaseType = "Array" + tomlHash tomlBaseType = "Hash" + tomlArrayHash tomlBaseType = "ArrayHash" +) + +// typeOfPrimitive returns a tomlType of any primitive value in TOML. +// Primitive values are: Integer, Float, Datetime, String and Bool. +// +// Passing a lexer item other than the following will cause a BUG message +// to occur: itemString, itemBool, itemInteger, itemFloat, itemDatetime. +func (p *parser) typeOfPrimitive(lexItem item) tomlType { + switch lexItem.typ { + case itemInteger: + return tomlInteger + case itemFloat: + return tomlFloat + case itemDatetime: + return tomlDatetime + case itemString: + return tomlString + case itemMultilineString: + return tomlString + case itemRawString: + return tomlString + case itemRawMultilineString: + return tomlString + case itemBool: + return tomlBool + } + p.bug("Cannot infer primitive type of lex item '%s'.", lexItem) + panic("unreachable") +} + +// typeOfArray returns a tomlType for an array given a list of types of its +// values. +// +// In the current spec, if an array is homogeneous, then its type is always +// "Array". If the array is not homogeneous, an error is generated. +func (p *parser) typeOfArray(types []tomlType) tomlType { + // Empty arrays are cool. + if len(types) == 0 { + return tomlArray + } + + theType := types[0] + for _, t := range types[1:] { + if !typeEqual(theType, t) { + p.panicf("Array contains values of type '%s' and '%s', but "+ + "arrays must be homogeneous.", theType, t) + } + } + return tomlArray +} diff --git a/vendor/github.com/BurntSushi/toml/type_fields.go b/vendor/github.com/BurntSushi/toml/type_fields.go new file mode 100644 index 000000000000..608997c22f68 --- /dev/null +++ b/vendor/github.com/BurntSushi/toml/type_fields.go @@ -0,0 +1,242 @@ +package toml + +// Struct field handling is adapted from code in encoding/json: +// +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the Go distribution. + +import ( + "reflect" + "sort" + "sync" +) + +// A field represents a single field found in a struct. +type field struct { + name string // the name of the field (`toml` tag included) + tag bool // whether field has a `toml` tag + index []int // represents the depth of an anonymous field + typ reflect.Type // the type of the field +} + +// byName sorts field by name, breaking ties with depth, +// then breaking ties with "name came from toml tag", then +// breaking ties with index sequence. +type byName []field + +func (x byName) Len() int { return len(x) } + +func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] } + +func (x byName) Less(i, j int) bool { + if x[i].name != x[j].name { + return x[i].name < x[j].name + } + if len(x[i].index) != len(x[j].index) { + return len(x[i].index) < len(x[j].index) + } + if x[i].tag != x[j].tag { + return x[i].tag + } + return byIndex(x).Less(i, j) +} + +// byIndex sorts field by index sequence. +type byIndex []field + +func (x byIndex) Len() int { return len(x) } + +func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] } + +func (x byIndex) Less(i, j int) bool { + for k, xik := range x[i].index { + if k >= len(x[j].index) { + return false + } + if xik != x[j].index[k] { + return xik < x[j].index[k] + } + } + return len(x[i].index) < len(x[j].index) +} + +// typeFields returns a list of fields that TOML should recognize for the given +// type. The algorithm is breadth-first search over the set of structs to +// include - the top struct and then any reachable anonymous structs. +func typeFields(t reflect.Type) []field { + // Anonymous fields to explore at the current level and the next. + current := []field{} + next := []field{{typ: t}} + + // Count of queued names for current level and the next. + count := map[reflect.Type]int{} + nextCount := map[reflect.Type]int{} + + // Types already visited at an earlier level. + visited := map[reflect.Type]bool{} + + // Fields found. + var fields []field + + for len(next) > 0 { + current, next = next, current[:0] + count, nextCount = nextCount, map[reflect.Type]int{} + + for _, f := range current { + if visited[f.typ] { + continue + } + visited[f.typ] = true + + // Scan f.typ for fields to include. + for i := 0; i < f.typ.NumField(); i++ { + sf := f.typ.Field(i) + if sf.PkgPath != "" && !sf.Anonymous { // unexported + continue + } + opts := getOptions(sf.Tag) + if opts.skip { + continue + } + index := make([]int, len(f.index)+1) + copy(index, f.index) + index[len(f.index)] = i + + ft := sf.Type + if ft.Name() == "" && ft.Kind() == reflect.Ptr { + // Follow pointer. + ft = ft.Elem() + } + + // Record found field and index sequence. + if opts.name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct { + tagged := opts.name != "" + name := opts.name + if name == "" { + name = sf.Name + } + fields = append(fields, field{name, tagged, index, ft}) + if count[f.typ] > 1 { + // If there were multiple instances, add a second, + // so that the annihilation code will see a duplicate. + // It only cares about the distinction between 1 or 2, + // so don't bother generating any more copies. + fields = append(fields, fields[len(fields)-1]) + } + continue + } + + // Record new anonymous struct to explore in next round. + nextCount[ft]++ + if nextCount[ft] == 1 { + f := field{name: ft.Name(), index: index, typ: ft} + next = append(next, f) + } + } + } + } + + sort.Sort(byName(fields)) + + // Delete all fields that are hidden by the Go rules for embedded fields, + // except that fields with TOML tags are promoted. + + // The fields are sorted in primary order of name, secondary order + // of field index length. Loop over names; for each name, delete + // hidden fields by choosing the one dominant field that survives. + out := fields[:0] + for advance, i := 0, 0; i < len(fields); i += advance { + // One iteration per name. + // Find the sequence of fields with the name of this first field. + fi := fields[i] + name := fi.name + for advance = 1; i+advance < len(fields); advance++ { + fj := fields[i+advance] + if fj.name != name { + break + } + } + if advance == 1 { // Only one field with this name + out = append(out, fi) + continue + } + dominant, ok := dominantField(fields[i : i+advance]) + if ok { + out = append(out, dominant) + } + } + + fields = out + sort.Sort(byIndex(fields)) + + return fields +} + +// dominantField looks through the fields, all of which are known to +// have the same name, to find the single field that dominates the +// others using Go's embedding rules, modified by the presence of +// TOML tags. If there are multiple top-level fields, the boolean +// will be false: This condition is an error in Go and we skip all +// the fields. +func dominantField(fields []field) (field, bool) { + // The fields are sorted in increasing index-length order. The winner + // must therefore be one with the shortest index length. Drop all + // longer entries, which is easy: just truncate the slice. + length := len(fields[0].index) + tagged := -1 // Index of first tagged field. + for i, f := range fields { + if len(f.index) > length { + fields = fields[:i] + break + } + if f.tag { + if tagged >= 0 { + // Multiple tagged fields at the same level: conflict. + // Return no field. + return field{}, false + } + tagged = i + } + } + if tagged >= 0 { + return fields[tagged], true + } + // All remaining fields have the same length. If there's more than one, + // we have a conflict (two fields named "X" at the same level) and we + // return no field. + if len(fields) > 1 { + return field{}, false + } + return fields[0], true +} + +var fieldCache struct { + sync.RWMutex + m map[reflect.Type][]field +} + +// cachedTypeFields is like typeFields but uses a cache to avoid repeated work. +func cachedTypeFields(t reflect.Type) []field { + fieldCache.RLock() + f := fieldCache.m[t] + fieldCache.RUnlock() + if f != nil { + return f + } + + // Compute fields without lock. + // Might duplicate effort but won't hold other computations back. + f = typeFields(t) + if f == nil { + f = []field{} + } + + fieldCache.Lock() + if fieldCache.m == nil { + fieldCache.m = map[reflect.Type][]field{} + } + fieldCache.m[t] = f + fieldCache.Unlock() + return f +} diff --git a/vendor/github.com/DataDog/zstd/LICENSE b/vendor/github.com/DataDog/zstd/LICENSE deleted file mode 100644 index 345c1eb932f9..000000000000 --- a/vendor/github.com/DataDog/zstd/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Simplified BSD License - -Copyright (c) 2016, Datadog -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/DataDog/zstd/README.md b/vendor/github.com/DataDog/zstd/README.md deleted file mode 100644 index d38eab55bc27..000000000000 --- a/vendor/github.com/DataDog/zstd/README.md +++ /dev/null @@ -1,114 +0,0 @@ -# Zstd Go Wrapper - -[C Zstd Homepage](https://github.com/Cyan4973/zstd) - -The current headers and C files are from *v0.5.0* (Commit [201433a](https://github.com/Cyan4973/zstd/commits/201433a7f713af056cc7ea32624eddefb55e10c8)). - -This version has been tested and used in Datadog production environment and is safe for use. - -## Usage - -There are two main APIs: - -* simple Compress/Decompress -* streaming API (io.Reader/io.Writer) - -The compress/decompress APIs mirror that of lz4, while the streaming API was -designed to be a drop-in replacement for zlib. - -### Simple `Compress/Decompress` - - -```go -// Compress compresses the byte array given in src and writes it to dst. -// If you already have a buffer allocated, you can pass it to prevent allocation -// If not, you can pass nil as dst. -// If the buffer is too small, it will be reallocated, resized, and returned bu the function -// If dst is nil, this will allocate the worst case size (CompressBound(src)) -Compress(dst, src []byte) ([]byte, error) -``` - -```go -// CompressLevel is the same as Compress but you can pass another compression level -CompressLevel(dst, src []byte, level int) ([]byte, error) -``` - -```go -// Decompress will decompress your payload into dst. -// If you already have a buffer allocated, you can pass it to prevent allocation -// If not, you can pass nil as dst (allocates a 4*src size as default). -// If the buffer is too small, it will retry 3 times by doubling the dst size -// After max retries, it will switch to the slower stream API to be sure to be able -// to decompress. Currently switches if compression ratio > 4*2**3=32. -Decompress(dst, src []byte) ([]byte, error) -``` - -### Stream API - -```go -// NewWriter creates a new object that can optionally be initialized with -// a precomputed dictionary. If dict is nil, compress without a dictionary. -// The dictionary array should not be changed during the use of this object. -// You MUST CALL Close() to write the last bytes of a zstd stream and free C objects. -NewWriter(w io.Writer) *Writer -NewWriterLevel(w io.Writer, level int) *Writer -NewWriterLevelDict(w io.Writer, level int, dict []byte) *Writer - -// Write compresses the input data and write it to the underlying writer -(w *Writer) Write(p []byte) (int, error) - -// Close flushes the buffer and frees C zstd objects -(w *Writer) Close() error -``` - -```go -// NewReader returns a new io.ReadCloser that will decompress data from the -// underlying reader. If a dictionary is provided to NewReaderDict, it must -// not be modified until Close is called. It is the caller's responsibility -// to call Close, which frees up C objects. -NewReader(r io.Reader) io.ReadCloser -NewReaderDict(r io.Reader, dict []byte) io.ReadCloser -``` - -### Benchmarks - -The author of Zstd also wrote lz4. Zstd is intended to occupy a speed/ratio -level similar to what zlib currently provides. In our tests, the can always -be made to be better than zlib by chosing an appropriate level while still -keeping compression and decompression time faster than zlib. - -Compression of a 7Mb pdf zstd (this wrapper) vs [czlib](https://github.com/DataDog/czlib): -``` -BenchmarkCompression 5 221056624 ns/op 67.34 MB/s -BenchmarkDecompression 100 18370416 ns/op 810.32 MB/s - -BenchmarkFzlibCompress 2 610156603 ns/op 24.40 MB/s -BenchmarkFzlibDecompress 20 81195246 ns/op 183.33 MB/s -``` - -Ratio is also better by a margin of ~20%. -Compression speed is always better than zlib on all the payloads we tested; -However, [czlib](https://github.com/DataDog/czlib) has optimisations that make it -faster at decompressiong small payloads: - -``` -Testing with size: 11... czlib: 8.97 MB/s, zstd: 3.26 MB/s -Testing with size: 27... czlib: 23.3 MB/s, zstd: 8.22 MB/s -Testing with size: 62... czlib: 31.6 MB/s, zstd: 19.49 MB/s -Testing with size: 141... czlib: 74.54 MB/s, zstd: 42.55 MB/s -Testing with size: 323... czlib: 155.14 MB/s, zstd: 99.39 MB/s -Testing with size: 739... czlib: 235.9 MB/s, zstd: 216.45 MB/s -Testing with size: 1689... czlib: 116.45 MB/s, zstd: 345.64 MB/s -Testing with size: 3858... czlib: 176.39 MB/s, zstd: 617.56 MB/s -Testing with size: 8811... czlib: 254.11 MB/s, zstd: 824.34 MB/s -Testing with size: 20121... czlib: 197.43 MB/s, zstd: 1339.11 MB/s -Testing with size: 45951... czlib: 201.62 MB/s, zstd: 1951.57 MB/s -``` - -zstd starts to shine with payloads > 1KB - -### Stability - Current state: STABLE - -The C library seems to be pretty stable and according to the author has been tested and fuzzed. - -For the Go wrapper, the test cover most usual cases and we have succesfully tested it on all staging and prod data. diff --git a/vendor/github.com/DataDog/zstd/ZSTD_LICENSE b/vendor/github.com/DataDog/zstd/ZSTD_LICENSE deleted file mode 100644 index 35495850f2e8..000000000000 --- a/vendor/github.com/DataDog/zstd/ZSTD_LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -ZSTD Library -Copyright (c) 2014-2015, Yann Collet -All rights reserved. - -BSD License - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, this - list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/DataDog/zstd/bitstream.h b/vendor/github.com/DataDog/zstd/bitstream.h deleted file mode 100644 index e0487e87e8c8..000000000000 --- a/vendor/github.com/DataDog/zstd/bitstream.h +++ /dev/null @@ -1,375 +0,0 @@ -/* ****************************************************************** - bitstream - Part of FSE library - header file (to include) - Copyright (C) 2013-2016, Yann Collet. - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - Source repository : https://github.com/Cyan4973/FiniteStateEntropy -****************************************************************** */ -#ifndef BITSTREAM_H_MODULE -#define BITSTREAM_H_MODULE - -#if defined (__cplusplus) -extern "C" { -#endif - - -/* -* This API consists of small unitary functions, which highly benefit from being inlined. -* Since link-time-optimization is not available for all compilers, -* these functions are defined into a .h to be included. -*/ - -/*-**************************************** -* Dependencies -******************************************/ -#include "mem.h" /* unaligned access routines */ -#include "error_private.h" /* error codes and messages */ - - -/*-****************************************** -* bitStream encoding API (write forward) -********************************************/ -/*! -* bitStream can mix input from multiple sources. -* A critical property of these streams is that they encode and decode in **reverse** direction. -* So the first bit sequence you add will be the last to be read, like a LIFO stack. -*/ -typedef struct -{ - size_t bitContainer; - int bitPos; - char* startPtr; - char* ptr; - char* endPtr; -} BIT_CStream_t; - -MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, void* dstBuffer, size_t dstCapacity); -MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC, size_t value, unsigned nbBits); -MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC); -MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC); - -/*! -* Start by initCStream, providing the size of buffer to write into. -* bitStream will never write outside of this buffer. -* @dstCapacity must be >= sizeof(size_t), otherwise @return will be an error code. -* -* bits are first added to a local register. -* Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems. -* Writing data into memory is an explicit operation, performed by the flushBits function. -* Hence keep track how many bits are potentially stored into local register to avoid register overflow. -* After a flushBits, a maximum of 7 bits might still be stored into local register. -* -* Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers. -* -* Last operation is to close the bitStream. -* The function returns the final size of CStream in bytes. -* If data couldn't fit into @dstBuffer, it will return a 0 ( == not storable) -*/ - - -/*-******************************************** -* bitStream decoding API (read backward) -**********************************************/ -typedef struct -{ - size_t bitContainer; - unsigned bitsConsumed; - const char* ptr; - const char* start; -} BIT_DStream_t; - -typedef enum { BIT_DStream_unfinished = 0, - BIT_DStream_endOfBuffer = 1, - BIT_DStream_completed = 2, - BIT_DStream_overflow = 3 } BIT_DStream_status; /* result of BIT_reloadDStream() */ - /* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */ - -MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize); -MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits); -MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD); -MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* bitD); - - -/*! -* Start by invoking BIT_initDStream(). -* A chunk of the bitStream is then stored into a local register. -* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t). -* You can then retrieve bitFields stored into the local register, **in reverse order**. -* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method. -* A reload guarantee a minimum of ((8*sizeof(size_t))-7) bits when its result is BIT_DStream_unfinished. -* Otherwise, it can be less than that, so proceed accordingly. -* Checking if DStream has reached its end can be performed with BIT_endOfDStream() -*/ - - -/*-**************************************** -* unsafe API -******************************************/ -MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, size_t value, unsigned nbBits); -/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */ - -MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC); -/* unsafe version; does not check buffer overflow */ - -MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits); -/* faster, but works only if nbBits >= 1 */ - - - -/*-************************************************************** -* Helper functions -****************************************************************/ -MEM_STATIC unsigned BIT_highbit32 (register U32 val) -{ -# if defined(_MSC_VER) /* Visual */ - unsigned long r=0; - _BitScanReverse ( &r, val ); - return (unsigned) r; -# elif defined(__GNUC__) && (__GNUC__ >= 3) /* Use GCC Intrinsic */ - return 31 - __builtin_clz (val); -# else /* Software version */ - static const unsigned DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 }; - U32 v = val; - unsigned r; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - r = DeBruijnClz[ (U32) (v * 0x07C4ACDDU) >> 27]; - return r; -# endif -} - - -/*-************************************************************** -* bitStream encoding -****************************************************************/ -MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, void* startPtr, size_t maxSize) -{ - bitC->bitContainer = 0; - bitC->bitPos = 0; - bitC->startPtr = (char*)startPtr; - bitC->ptr = bitC->startPtr; - bitC->endPtr = bitC->startPtr + maxSize - sizeof(bitC->ptr); - if (maxSize < sizeof(bitC->ptr)) return ERROR(dstSize_tooSmall); - return 0; -} - -MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC, size_t value, unsigned nbBits) -{ - static const unsigned mask[] = { 0, 1, 3, 7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF, 0x1FFFF, 0x3FFFF, 0x7FFFF, 0xFFFFF, 0x1FFFFF, 0x3FFFFF, 0x7FFFFF, 0xFFFFFF, 0x1FFFFFF }; /* up to 25 bits */ - bitC->bitContainer |= (value & mask[nbBits]) << bitC->bitPos; - bitC->bitPos += nbBits; -} - -/*! BIT_addBitsFast - * works only if `value` is _clean_, meaning all high bits above nbBits are 0 */ -MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, size_t value, unsigned nbBits) -{ - bitC->bitContainer |= value << bitC->bitPos; - bitC->bitPos += nbBits; -} - -/*! BIT_flushBitsFast - * unsafe version; does not check buffer overflow */ -MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC) -{ - size_t nbBytes = bitC->bitPos >> 3; - MEM_writeLEST(bitC->ptr, bitC->bitContainer); - bitC->ptr += nbBytes; - bitC->bitPos &= 7; - bitC->bitContainer >>= nbBytes*8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ -} - -MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC) -{ - size_t nbBytes = bitC->bitPos >> 3; - MEM_writeLEST(bitC->ptr, bitC->bitContainer); - bitC->ptr += nbBytes; - if (bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr; - bitC->bitPos &= 7; - bitC->bitContainer >>= nbBytes*8; /* if bitPos >= sizeof(bitContainer)*8 --> undefined behavior */ -} - -/*! BIT_closeCStream - * @result : size of CStream, in bytes, or 0 if it cannot fit into dstBuffer */ -MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC) -{ - char* endPtr; - - BIT_addBitsFast(bitC, 1, 1); /* endMark */ - BIT_flushBits(bitC); - - if (bitC->ptr >= bitC->endPtr) /* too close to buffer's end */ - return 0; /* not storable */ - - endPtr = bitC->ptr; - endPtr += bitC->bitPos > 0; /* remaining bits (incomplete byte) */ - - return (endPtr - bitC->startPtr); -} - - -/*-******************************************************** -* bitStream decoding -**********************************************************/ -/*!BIT_initDStream -* Initialize a BIT_DStream_t. -* @bitD : a pointer to an already allocated BIT_DStream_t structure -* @srcBuffer must point at the beginning of a bitStream -* @srcSize must be the exact size of the bitStream -* @result : size of stream (== srcSize) or an errorCode if a problem is detected -*/ -MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize) -{ - if (srcSize < 1) { memset(bitD, 0, sizeof(*bitD)); return ERROR(srcSize_wrong); } - - if (srcSize >= sizeof(size_t)) { /* normal case */ - U32 contain32; - bitD->start = (const char*)srcBuffer; - bitD->ptr = (const char*)srcBuffer + srcSize - sizeof(size_t); - bitD->bitContainer = MEM_readLEST(bitD->ptr); - contain32 = ((const BYTE*)srcBuffer)[srcSize-1]; - if (contain32 == 0) return ERROR(GENERIC); /* endMark not present */ - bitD->bitsConsumed = 8 - BIT_highbit32(contain32); - } else { - U32 contain32; - bitD->start = (const char*)srcBuffer; - bitD->ptr = bitD->start; - bitD->bitContainer = *(const BYTE*)(bitD->start); - switch(srcSize) - { - case 7: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[6]) << (sizeof(size_t)*8 - 16); - case 6: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[5]) << (sizeof(size_t)*8 - 24); - case 5: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[4]) << (sizeof(size_t)*8 - 32); - case 4: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[3]) << 24; - case 3: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[2]) << 16; - case 2: bitD->bitContainer += (size_t)(((const BYTE*)(bitD->start))[1]) << 8; - default:; - } - contain32 = ((const BYTE*)srcBuffer)[srcSize-1]; - if (contain32 == 0) return ERROR(GENERIC); /* endMark not present */ - bitD->bitsConsumed = 8 - BIT_highbit32(contain32); - bitD->bitsConsumed += (U32)(sizeof(size_t) - srcSize)*8; - } - - return srcSize; -} - -/*!BIT_lookBits - * Provides next n bits from local register - * local register is not modified (bits are still present for next read/look) - * On 32-bits, maxNbBits==25 - * On 64-bits, maxNbBits==57 - * @return : value extracted - */ -MEM_STATIC size_t BIT_lookBits(BIT_DStream_t* bitD, U32 nbBits) -{ - const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1; - return ((bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> 1) >> ((bitMask-nbBits) & bitMask); -} - -/*! BIT_lookBitsFast : -* unsafe version; only works only if nbBits >= 1 */ -MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits) -{ - const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1; - return (bitD->bitContainer << (bitD->bitsConsumed & bitMask)) >> (((bitMask+1)-nbBits) & bitMask); -} - -MEM_STATIC void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits) -{ - bitD->bitsConsumed += nbBits; -} - -/*!BIT_readBits - * Read next n bits from local register. - * pay attention to not read more than nbBits contained into local register. - * @return : extracted value. - */ -MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, U32 nbBits) -{ - size_t value = BIT_lookBits(bitD, nbBits); - BIT_skipBits(bitD, nbBits); - return value; -} - -/*!BIT_readBitsFast : -* unsafe version; only works only if nbBits >= 1 */ -MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits) -{ - size_t value = BIT_lookBitsFast(bitD, nbBits); - BIT_skipBits(bitD, nbBits); - return value; -} - -MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD) -{ - if (bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8)) /* should never happen */ - return BIT_DStream_overflow; - - if (bitD->ptr >= bitD->start + sizeof(bitD->bitContainer)) { - bitD->ptr -= bitD->bitsConsumed >> 3; - bitD->bitsConsumed &= 7; - bitD->bitContainer = MEM_readLEST(bitD->ptr); - return BIT_DStream_unfinished; - } - if (bitD->ptr == bitD->start) { - if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer; - return BIT_DStream_completed; - } - { - U32 nbBytes = bitD->bitsConsumed >> 3; - BIT_DStream_status result = BIT_DStream_unfinished; - if (bitD->ptr - nbBytes < bitD->start) { - nbBytes = (U32)(bitD->ptr - bitD->start); /* ptr > start */ - result = BIT_DStream_endOfBuffer; - } - bitD->ptr -= nbBytes; - bitD->bitsConsumed -= nbBytes*8; - bitD->bitContainer = MEM_readLEST(bitD->ptr); /* reminder : srcSize > sizeof(bitD) */ - return result; - } -} - -/*! BIT_endOfDStream -* @return Tells if DStream has reached its exact end -*/ -MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream) -{ - return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer)*8)); -} - -#if defined (__cplusplus) -} -#endif - -#endif /* BITSTREAM_H_MODULE */ diff --git a/vendor/github.com/DataDog/zstd/config.h b/vendor/github.com/DataDog/zstd/config.h deleted file mode 100644 index c2925d335bbb..000000000000 --- a/vendor/github.com/DataDog/zstd/config.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * config.h for libdivsufsort - * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef _CONFIG_H -#define _CONFIG_H 1 - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** Define to the version of this package. **/ -#define PROJECT_VERSION_FULL "2.0.1" - -/** Define to 1 if you have the header files. **/ -#define HAVE_INTTYPES_H 1 -#define HAVE_STDDEF_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_SYS_TYPES_H 1 - -/** for WinIO **/ -/* #undef HAVE_IO_H */ -/* #undef HAVE_FCNTL_H */ -/* #undef HAVE__SETMODE */ -/* #undef HAVE_SETMODE */ -/* #undef HAVE__FILENO */ -/* #undef HAVE_FOPEN_S */ -/* #undef HAVE__O_BINARY */ -/* -#ifndef HAVE__SETMODE -# if HAVE_SETMODE -# define _setmode setmode -# define HAVE__SETMODE 1 -# endif -# if HAVE__SETMODE && !HAVE__O_BINARY -# define _O_BINARY 0 -# define HAVE__O_BINARY 1 -# endif -#endif -*/ - -/** for inline **/ -#ifndef INLINE -# define INLINE inline -#endif - -/** for VC++ warning **/ -#ifdef _MSC_VER -#pragma warning(disable: 4127) -#endif - - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - -#endif /* _CONFIG_H */ diff --git a/vendor/github.com/DataDog/zstd/divsufsort.c b/vendor/github.com/DataDog/zstd/divsufsort.c deleted file mode 100644 index 312813597a4f..000000000000 --- a/vendor/github.com/DataDog/zstd/divsufsort.c +++ /dev/null @@ -1,404 +0,0 @@ -/* - * divsufsort.c for libdivsufsort - * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/*- Compiler specifics -*/ -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#endif - -/*- Dependencies -*/ -#include "divsufsort_private.h" -#ifdef _OPENMP -# include -#endif - - -/*- Private Functions -*/ - -/* Sorts suffixes of type B*. */ -static -saidx_t -sort_typeBstar(const sauchar_t *T, saidx_t *SA, - saidx_t *bucket_A, saidx_t *bucket_B, - saidx_t n) { - saidx_t *PAb, *ISAb, *buf; -#ifdef _OPENMP - saidx_t *curbuf; - saidx_t l; -#endif - saidx_t i, j, k, t, m, bufsize; - saint_t c0, c1; -#ifdef _OPENMP - saint_t d0, d1; - int tmp; -#endif - - /* Initialize bucket arrays. */ - for(i = 0; i < BUCKET_A_SIZE; ++i) { bucket_A[i] = 0; } - for(i = 0; i < BUCKET_B_SIZE; ++i) { bucket_B[i] = 0; } - - /* Count the number of occurrences of the first one or two characters of each - type A, B and B* suffix. Moreover, store the beginning position of all - type B* suffixes into the array SA. */ - for(i = n - 1, m = n, c0 = T[n - 1]; 0 <= i;) { - /* type A suffix. */ - do { ++BUCKET_A(c1 = c0); } while((0 <= --i) && ((c0 = T[i]) >= c1)); - if(0 <= i) { - /* type B* suffix. */ - ++BUCKET_BSTAR(c0, c1); - SA[--m] = i; - /* type B suffix. */ - for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) { - ++BUCKET_B(c0, c1); - } - } - } - m = n - m; -/* -note: - A type B* suffix is lexicographically smaller than a type B suffix that - begins with the same first two characters. -*/ - - /* Calculate the index of start/end point of each bucket. */ - for(c0 = 0, i = 0, j = 0; c0 < ALPHABET_SIZE; ++c0) { - t = i + BUCKET_A(c0); - BUCKET_A(c0) = i + j; /* start point */ - i = t + BUCKET_B(c0, c0); - for(c1 = c0 + 1; c1 < ALPHABET_SIZE; ++c1) { - j += BUCKET_BSTAR(c0, c1); - BUCKET_BSTAR(c0, c1) = j; /* end point */ - i += BUCKET_B(c0, c1); - } - } - - if(0 < m) { - /* Sort the type B* suffixes by their first two characters. */ - PAb = SA + n - m; ISAb = SA + m; - for(i = m - 2; 0 <= i; --i) { - t = PAb[i], c0 = T[t], c1 = T[t + 1]; - SA[--BUCKET_BSTAR(c0, c1)] = i; - } - t = PAb[m - 1], c0 = T[t], c1 = T[t + 1]; - SA[--BUCKET_BSTAR(c0, c1)] = m - 1; - - /* Sort the type B* substrings using sssort. */ -#ifdef _OPENMP - tmp = omp_get_max_threads(); - buf = SA + m, bufsize = (n - (2 * m)) / tmp; - c0 = ALPHABET_SIZE - 2, c1 = ALPHABET_SIZE - 1, j = m; -#pragma omp parallel default(shared) private(curbuf, k, l, d0, d1, tmp) - { - tmp = omp_get_thread_num(); - curbuf = buf + tmp * bufsize; - k = 0; - for(;;) { - #pragma omp critical(sssort_lock) - { - if(0 < (l = j)) { - d0 = c0, d1 = c1; - do { - k = BUCKET_BSTAR(d0, d1); - if(--d1 <= d0) { - d1 = ALPHABET_SIZE - 1; - if(--d0 < 0) { break; } - } - } while(((l - k) <= 1) && (0 < (l = k))); - c0 = d0, c1 = d1, j = k; - } - } - if(l == 0) { break; } - sssort(T, PAb, SA + k, SA + l, - curbuf, bufsize, 2, n, *(SA + k) == (m - 1)); - } - } -#else - buf = SA + m, bufsize = n - (2 * m); - for(c0 = ALPHABET_SIZE - 2, j = m; 0 < j; --c0) { - for(c1 = ALPHABET_SIZE - 1; c0 < c1; j = i, --c1) { - i = BUCKET_BSTAR(c0, c1); - if(1 < (j - i)) { - sssort(T, PAb, SA + i, SA + j, - buf, bufsize, 2, n, *(SA + i) == (m - 1)); - } - } - } -#endif - - /* Compute ranks of type B* substrings. */ - for(i = m - 1; 0 <= i; --i) { - if(0 <= SA[i]) { - j = i; - do { ISAb[SA[i]] = i; } while((0 <= --i) && (0 <= SA[i])); - SA[i + 1] = i - j; - if(i <= 0) { break; } - } - j = i; - do { ISAb[SA[i] = ~SA[i]] = j; } while(SA[--i] < 0); - ISAb[SA[i]] = j; - } - - /* Construct the inverse suffix array of type B* suffixes using trsort. */ - trsort(ISAb, SA, m, 1); - - /* Set the sorted order of tyoe B* suffixes. */ - for(i = n - 1, j = m, c0 = T[n - 1]; 0 <= i;) { - for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) >= c1); --i, c1 = c0) { } - if(0 <= i) { - t = i; - for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) { } - SA[ISAb[--j]] = ((t == 0) || (1 < (t - i))) ? t : ~t; - } - } - - /* Calculate the index of start/end point of each bucket. */ - BUCKET_B(ALPHABET_SIZE - 1, ALPHABET_SIZE - 1) = n; /* end point */ - for(c0 = ALPHABET_SIZE - 2, k = m - 1; 0 <= c0; --c0) { - i = BUCKET_A(c0 + 1) - 1; - for(c1 = ALPHABET_SIZE - 1; c0 < c1; --c1) { - t = i - BUCKET_B(c0, c1); - BUCKET_B(c0, c1) = i; /* end point */ - - /* Move all type B* suffixes to the correct position. */ - for(i = t, j = BUCKET_BSTAR(c0, c1); - j <= k; - --i, --k) { SA[i] = SA[k]; } - } - BUCKET_BSTAR(c0, c0 + 1) = i - BUCKET_B(c0, c0) + 1; /* start point */ - BUCKET_B(c0, c0) = i; /* end point */ - } - } - - return m; -} - -/* Constructs the suffix array by using the sorted order of type B* suffixes. */ -static -void -construct_SA(const sauchar_t *T, saidx_t *SA, - saidx_t *bucket_A, saidx_t *bucket_B, - saidx_t n, saidx_t m) { - saidx_t *i, *j, *k; - saidx_t s; - saint_t c0, c1, c2; - - if(0 < m) { - /* Construct the sorted order of type B suffixes by using - the sorted order of type B* suffixes. */ - for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) { - /* Scan the suffix array from right to left. */ - for(i = SA + BUCKET_BSTAR(c1, c1 + 1), - j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1; - i <= j; - --j) { - if(0 < (s = *j)) { - assert(T[s] == c1); - assert(((s + 1) < n) && (T[s] <= T[s + 1])); - assert(T[s - 1] <= T[s]); - *j = ~s; - c0 = T[--s]; - if((0 < s) && (T[s - 1] > c0)) { s = ~s; } - if(c0 != c2) { - if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; } - k = SA + BUCKET_B(c2 = c0, c1); - } - assert(k < j); - *k-- = s; - } else { - assert(((s == 0) && (T[s] == c1)) || (s < 0)); - *j = ~s; - } - } - } - } - - /* Construct the suffix array by using - the sorted order of type B suffixes. */ - k = SA + BUCKET_A(c2 = T[n - 1]); - *k++ = (T[n - 2] < c2) ? ~(n - 1) : (n - 1); - /* Scan the suffix array from left to right. */ - for(i = SA, j = SA + n; i < j; ++i) { - if(0 < (s = *i)) { - assert(T[s - 1] >= T[s]); - c0 = T[--s]; - if((s == 0) || (T[s - 1] < c0)) { s = ~s; } - if(c0 != c2) { - BUCKET_A(c2) = k - SA; - k = SA + BUCKET_A(c2 = c0); - } - assert(i < k); - *k++ = s; - } else { - assert(s < 0); - *i = ~s; - } - } -} - -/* Constructs the burrows-wheeler transformed string directly - by using the sorted order of type B* suffixes. */ -static -saidx_t -construct_BWT(const sauchar_t *T, saidx_t *SA, - saidx_t *bucket_A, saidx_t *bucket_B, - saidx_t n, saidx_t m) { - saidx_t *i, *j, *k, *orig; - saidx_t s; - saint_t c0, c1, c2; - - if(0 < m) { - /* Construct the sorted order of type B suffixes by using - the sorted order of type B* suffixes. */ - for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) { - /* Scan the suffix array from right to left. */ - for(i = SA + BUCKET_BSTAR(c1, c1 + 1), - j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1; - i <= j; - --j) { - if(0 < (s = *j)) { - assert(T[s] == c1); - assert(((s + 1) < n) && (T[s] <= T[s + 1])); - assert(T[s - 1] <= T[s]); - c0 = T[--s]; - *j = ~((saidx_t)c0); - if((0 < s) && (T[s - 1] > c0)) { s = ~s; } - if(c0 != c2) { - if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; } - k = SA + BUCKET_B(c2 = c0, c1); - } - assert(k < j); - *k-- = s; - } else if(s != 0) { - *j = ~s; -#ifndef NDEBUG - } else { - assert(T[s] == c1); -#endif - } - } - } - } - - /* Construct the BWTed string by using - the sorted order of type B suffixes. */ - k = SA + BUCKET_A(c2 = T[n - 1]); - *k++ = (T[n - 2] < c2) ? ~((saidx_t)T[n - 2]) : (n - 1); - /* Scan the suffix array from left to right. */ - for(i = SA, j = SA + n, orig = SA; i < j; ++i) { - if(0 < (s = *i)) { - assert(T[s - 1] >= T[s]); - c0 = T[--s]; - *i = c0; - if((0 < s) && (T[s - 1] < c0)) { s = ~((saidx_t)T[s - 1]); } - if(c0 != c2) { - BUCKET_A(c2) = k - SA; - k = SA + BUCKET_A(c2 = c0); - } - assert(i < k); - *k++ = s; - } else if(s != 0) { - *i = ~s; - } else { - orig = i; - } - } - - return orig - SA; -} - - -/*---------------------------------------------------------------------------*/ - -/*- Function -*/ - -saint_t -divsufsort(const sauchar_t *T, saidx_t *SA, saidx_t n) { - saidx_t *bucket_A, *bucket_B; - saidx_t m; - saint_t err = 0; - - /* Check arguments. */ - if((T == NULL) || (SA == NULL) || (n < 0)) { return -1; } - else if(n == 0) { return 0; } - else if(n == 1) { SA[0] = 0; return 0; } - else if(n == 2) { m = (T[0] < T[1]); SA[m ^ 1] = 0, SA[m] = 1; return 0; } - - bucket_A = (saidx_t *)malloc(BUCKET_A_SIZE * sizeof(saidx_t)); - bucket_B = (saidx_t *)malloc(BUCKET_B_SIZE * sizeof(saidx_t)); - - /* Suffixsort. */ - if((bucket_A != NULL) && (bucket_B != NULL)) { - m = sort_typeBstar(T, SA, bucket_A, bucket_B, n); - construct_SA(T, SA, bucket_A, bucket_B, n, m); - } else { - err = -2; - } - - free(bucket_B); - free(bucket_A); - - return err; -} - -saidx_t -divbwt(const sauchar_t *T, sauchar_t *U, saidx_t *A, saidx_t n) { - saidx_t *B; - saidx_t *bucket_A, *bucket_B; - saidx_t m, pidx, i; - - /* Check arguments. */ - if((T == NULL) || (U == NULL) || (n < 0)) { return -1; } - else if(n <= 1) { if(n == 1) { U[0] = T[0]; } return n; } - - if((B = A) == NULL) { B = (saidx_t *)malloc((size_t)(n + 1) * sizeof(saidx_t)); } - bucket_A = (saidx_t *)malloc(BUCKET_A_SIZE * sizeof(saidx_t)); - bucket_B = (saidx_t *)malloc(BUCKET_B_SIZE * sizeof(saidx_t)); - - /* Burrows-Wheeler Transform. */ - if((B != NULL) && (bucket_A != NULL) && (bucket_B != NULL)) { - m = sort_typeBstar(T, B, bucket_A, bucket_B, n); - pidx = construct_BWT(T, B, bucket_A, bucket_B, n, m); - - /* Copy to output string. */ - U[0] = T[n - 1]; - for(i = 0; i < pidx; ++i) { U[i + 1] = (sauchar_t)B[i]; } - for(i += 1; i < n; ++i) { U[i] = (sauchar_t)B[i]; } - pidx += 1; - } else { - pidx = -2; - } - - free(bucket_B); - free(bucket_A); - if(A == NULL) { free(B); } - - return pidx; -} - -const char * -divsufsort_version(void) { - return PROJECT_VERSION_FULL; -} diff --git a/vendor/github.com/DataDog/zstd/divsufsort.h b/vendor/github.com/DataDog/zstd/divsufsort.h deleted file mode 100644 index 6d3e648701ce..000000000000 --- a/vendor/github.com/DataDog/zstd/divsufsort.h +++ /dev/null @@ -1,180 +0,0 @@ -/* - * divsufsort.h for libdivsufsort - * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef _DIVSUFSORT_H -#define _DIVSUFSORT_H 1 - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -#ifndef DIVSUFSORT_API -# ifdef DIVSUFSORT_BUILD_DLL -# define DIVSUFSORT_API -# else -# define DIVSUFSORT_API -# endif -#endif - -/*- Datatypes -*/ -#ifndef SAUCHAR_T -#define SAUCHAR_T -typedef uint8_t sauchar_t; -#endif /* SAUCHAR_T */ -#ifndef SAINT_T -#define SAINT_T -typedef int32_t saint_t; -#endif /* SAINT_T */ -#ifndef SAIDX_T -#define SAIDX_T -typedef int32_t saidx_t; -#endif /* SAIDX_T */ -#ifndef PRIdSAINT_T -#define PRIdSAINT_T PRId32 -#endif /* PRIdSAINT_T */ -#ifndef PRIdSAIDX_T -#define PRIdSAIDX_T PRId32 -#endif /* PRIdSAIDX_T */ - - -/*- Prototypes -*/ - -/** - * Constructs the suffix array of a given string. - * @param T[0..n-1] The input string. - * @param SA[0..n-1] The output array of suffixes. - * @param n The length of the given string. - * @return 0 if no error occurred, -1 or -2 otherwise. - */ -DIVSUFSORT_API -saint_t -divsufsort(const sauchar_t *T, saidx_t *SA, saidx_t n); - -/** - * Constructs the burrows-wheeler transformed string of a given string. - * @param T[0..n-1] The input string. - * @param U[0..n-1] The output string. (can be T) - * @param A[0..n-1] The temporary array. (can be NULL) - * @param n The length of the given string. - * @return The primary index if no error occurred, -1 or -2 otherwise. - */ -DIVSUFSORT_API -saidx_t -divbwt(const sauchar_t *T, sauchar_t *U, saidx_t *A, saidx_t n); - -/** - * Returns the version of the divsufsort library. - * @return The version number string. - */ -DIVSUFSORT_API -const char * -divsufsort_version(void); - - -/** - * Constructs the burrows-wheeler transformed string of a given string and suffix array. - * @param T[0..n-1] The input string. - * @param U[0..n-1] The output string. (can be T) - * @param SA[0..n-1] The suffix array. (can be NULL) - * @param n The length of the given string. - * @param idx The output primary index. - * @return 0 if no error occurred, -1 or -2 otherwise. - */ -DIVSUFSORT_API -saint_t -bw_transform(const sauchar_t *T, sauchar_t *U, - saidx_t *SA /* can NULL */, - saidx_t n, saidx_t *idx); - -/** - * Inverse BW-transforms a given BWTed string. - * @param T[0..n-1] The input string. - * @param U[0..n-1] The output string. (can be T) - * @param A[0..n-1] The temporary array. (can be NULL) - * @param n The length of the given string. - * @param idx The primary index. - * @return 0 if no error occurred, -1 or -2 otherwise. - */ -DIVSUFSORT_API -saint_t -inverse_bw_transform(const sauchar_t *T, sauchar_t *U, - saidx_t *A /* can NULL */, - saidx_t n, saidx_t idx); - -/** - * Checks the correctness of a given suffix array. - * @param T[0..n-1] The input string. - * @param SA[0..n-1] The input suffix array. - * @param n The length of the given string. - * @param verbose The verbose mode. - * @return 0 if no error occurred. - */ -DIVSUFSORT_API -saint_t -sufcheck(const sauchar_t *T, const saidx_t *SA, saidx_t n, saint_t verbose); - -/** - * Search for the pattern P in the string T. - * @param T[0..Tsize-1] The input string. - * @param Tsize The length of the given string. - * @param P[0..Psize-1] The input pattern string. - * @param Psize The length of the given pattern string. - * @param SA[0..SAsize-1] The input suffix array. - * @param SAsize The length of the given suffix array. - * @param idx The output index. - * @return The count of matches if no error occurred, -1 otherwise. - */ -DIVSUFSORT_API -saidx_t -sa_search(const sauchar_t *T, saidx_t Tsize, - const sauchar_t *P, saidx_t Psize, - const saidx_t *SA, saidx_t SAsize, - saidx_t *left); - -/** - * Search for the character c in the string T. - * @param T[0..Tsize-1] The input string. - * @param Tsize The length of the given string. - * @param SA[0..SAsize-1] The input suffix array. - * @param SAsize The length of the given suffix array. - * @param c The input character. - * @param idx The output index. - * @return The count of matches if no error occurred, -1 otherwise. - */ -DIVSUFSORT_API -saidx_t -sa_simplesearch(const sauchar_t *T, saidx_t Tsize, - const saidx_t *SA, saidx_t SAsize, - saint_t c, saidx_t *left); - - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - -#endif /* _DIVSUFSORT_H */ diff --git a/vendor/github.com/DataDog/zstd/divsufsort_private.h b/vendor/github.com/DataDog/zstd/divsufsort_private.h deleted file mode 100644 index 0a18f6d28cb3..000000000000 --- a/vendor/github.com/DataDog/zstd/divsufsort_private.h +++ /dev/null @@ -1,212 +0,0 @@ -/* - * divsufsort_private.h for libdivsufsort - * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef _DIVSUFSORT_PRIVATE_H -#define _DIVSUFSORT_PRIVATE_H 1 - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* ************************* -* Includes -***************************/ -#include -#include /* unconditional */ -#include -#include "config.h" /* unconditional */ - - -#if HAVE_STRING_H -# include -#endif -#if HAVE_MEMORY_H -# include -#endif -#if HAVE_STDDEF_H -# include -#endif -#if HAVE_STRINGS_H -# ifdef _WIN32 -# include -# else -# include -# endif -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if defined(BUILD_DIVSUFSORT64) -# include "divsufsort64.h" -# ifndef SAIDX_T -# define SAIDX_T -# define saidx_t saidx64_t -# endif /* SAIDX_T */ -# ifndef PRIdSAIDX_T -# define PRIdSAIDX_T PRIdSAIDX64_T -# endif /* PRIdSAIDX_T */ -# define divsufsort divsufsort64 -# define divbwt divbwt64 -# define divsufsort_version divsufsort64_version -# define bw_transform bw_transform64 -# define inverse_bw_transform inverse_bw_transform64 -# define sufcheck sufcheck64 -# define sa_search sa_search64 -# define sa_simplesearch sa_simplesearch64 -# define sssort sssort64 -# define trsort trsort64 -#else -# include "divsufsort.h" -#endif - - -/*- Constants -*/ -#if !defined(UINT8_MAX) -# define UINT8_MAX (255) -#endif /* UINT8_MAX */ -#if defined(ALPHABET_SIZE) && (ALPHABET_SIZE < 1) -# undef ALPHABET_SIZE -#endif -#if !defined(ALPHABET_SIZE) -# define ALPHABET_SIZE (UINT8_MAX + 1) -#endif -/* for divsufsort.c */ -#define BUCKET_A_SIZE (ALPHABET_SIZE) -#define BUCKET_B_SIZE (ALPHABET_SIZE * ALPHABET_SIZE) -/* for sssort.c */ -#if defined(SS_INSERTIONSORT_THRESHOLD) -# if SS_INSERTIONSORT_THRESHOLD < 1 -# undef SS_INSERTIONSORT_THRESHOLD -# define SS_INSERTIONSORT_THRESHOLD (1) -# endif -#else -# define SS_INSERTIONSORT_THRESHOLD (8) -#endif -#if defined(SS_BLOCKSIZE) -# if SS_BLOCKSIZE < 0 -# undef SS_BLOCKSIZE -# define SS_BLOCKSIZE (0) -# elif 32768 <= SS_BLOCKSIZE -# undef SS_BLOCKSIZE -# define SS_BLOCKSIZE (32767) -# endif -#else -# define SS_BLOCKSIZE (1024) -#endif -/* minstacksize = log(SS_BLOCKSIZE) / log(3) * 2 */ -#if SS_BLOCKSIZE == 0 -# if defined(BUILD_DIVSUFSORT64) -# define SS_MISORT_STACKSIZE (96) -# else -# define SS_MISORT_STACKSIZE (64) -# endif -#elif SS_BLOCKSIZE <= 4096 -# define SS_MISORT_STACKSIZE (16) -#else -# define SS_MISORT_STACKSIZE (24) -#endif -#if defined(BUILD_DIVSUFSORT64) -# define SS_SMERGE_STACKSIZE (64) -#else -# define SS_SMERGE_STACKSIZE (32) -#endif -/* for trsort.c */ -#define TR_INSERTIONSORT_THRESHOLD (8) -#if defined(BUILD_DIVSUFSORT64) -# define TR_STACKSIZE (96) -#else -# define TR_STACKSIZE (64) -#endif - - -/*- Macros -*/ -#ifndef SWAP -# define SWAP(_a, _b) do { t = (_a); (_a) = (_b); (_b) = t; } while(0) -#endif /* SWAP */ -#ifndef MIN -# define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b)) -#endif /* MIN */ -#ifndef MAX -# define MAX(_a, _b) (((_a) > (_b)) ? (_a) : (_b)) -#endif /* MAX */ -#define STACK_PUSH(_a, _b, _c, _d)\ - do {\ - assert(ssize < STACK_SIZE);\ - stack[ssize].a = (_a), stack[ssize].b = (_b),\ - stack[ssize].c = (_c), stack[ssize++].d = (_d);\ - } while(0) -#define STACK_PUSH5(_a, _b, _c, _d, _e)\ - do {\ - assert(ssize < STACK_SIZE);\ - stack[ssize].a = (_a), stack[ssize].b = (_b),\ - stack[ssize].c = (_c), stack[ssize].d = (_d), stack[ssize++].e = (_e);\ - } while(0) -#define STACK_POP(_a, _b, _c, _d)\ - do {\ - assert(0 <= ssize);\ - if(ssize == 0) { return; }\ - (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\ - (_c) = stack[ssize].c, (_d) = stack[ssize].d;\ - } while(0) -#define STACK_POP5(_a, _b, _c, _d, _e)\ - do {\ - assert(0 <= ssize);\ - if(ssize == 0) { return; }\ - (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\ - (_c) = stack[ssize].c, (_d) = stack[ssize].d, (_e) = stack[ssize].e;\ - } while(0) -/* for divsufsort.c */ -#define BUCKET_A(_c0) bucket_A[(_c0)] -#if ALPHABET_SIZE == 256 -#define BUCKET_B(_c0, _c1) (bucket_B[((_c1) << 8) | (_c0)]) -#define BUCKET_BSTAR(_c0, _c1) (bucket_B[((_c0) << 8) | (_c1)]) -#else -#define BUCKET_B(_c0, _c1) (bucket_B[(_c1) * ALPHABET_SIZE + (_c0)]) -#define BUCKET_BSTAR(_c0, _c1) (bucket_B[(_c0) * ALPHABET_SIZE + (_c1)]) -#endif - - -/*- Private Prototypes -*/ -/* sssort.c */ -void -sssort(const sauchar_t *Td, const saidx_t *PA, - saidx_t *first, saidx_t *last, - saidx_t *buf, saidx_t bufsize, - saidx_t depth, saidx_t n, saint_t lastsuffix); -/* trsort.c */ -void -trsort(saidx_t *ISA, saidx_t *SA, saidx_t n, saidx_t depth); - - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - -#endif /* _DIVSUFSORT_PRIVATE_H */ diff --git a/vendor/github.com/DataDog/zstd/error_private.h b/vendor/github.com/DataDog/zstd/error_private.h deleted file mode 100644 index c0c3f49001f5..000000000000 --- a/vendor/github.com/DataDog/zstd/error_private.h +++ /dev/null @@ -1,118 +0,0 @@ -/* ****************************************************************** - Error codes and messages - Copyright (C) 2013-2016, Yann Collet - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - Source repository : https://github.com/Cyan4973/zstd -****************************************************************** */ -/* Note : this module is expected to remain private, do not expose it */ - -#ifndef ERROR_H_MODULE -#define ERROR_H_MODULE - -#if defined (__cplusplus) -extern "C" { -#endif - - -/* **************************************** -* Dependencies -******************************************/ -#include /* size_t */ -#include "error_public.h" /* enum list */ - - -/* **************************************** -* Compiler-specific -******************************************/ -#if defined(__GNUC__) -# define ERR_STATIC static __attribute__((unused)) -#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) -# define ERR_STATIC static inline -#elif defined(_MSC_VER) -# define ERR_STATIC static __inline -#else -# define ERR_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */ -#endif - - -/*-**************************************** -* Customization -******************************************/ -typedef ZSTD_ErrorCode ERR_enum; -#define PREFIX(name) ZSTD_error_##name - - -/*-**************************************** -* Error codes handling -******************************************/ -#ifdef ERROR -# undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */ -#endif -#define ERROR(name) (size_t)-PREFIX(name) - -ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); } - -ERR_STATIC ERR_enum ERR_getError(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); } - - -/*-**************************************** -* Error Strings -******************************************/ - -ERR_STATIC const char* ERR_getErrorName(size_t code) -{ - static const char* notErrorCode = "Unspecified error code"; - switch( ERR_getError(code) ) - { - case PREFIX(no_error): return "No error detected"; - case PREFIX(GENERIC): return "Error (generic)"; - case PREFIX(prefix_unknown): return "Unknown frame descriptor"; - case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter"; - case PREFIX(frameParameter_unsupportedBy32bits): return "Frame parameter unsupported in 32-bits mode"; - case PREFIX(init_missing): return "Context should be init first"; - case PREFIX(memory_allocation): return "Allocation error : not enough memory"; - case PREFIX(stage_wrong): return "Operation not authorized at current processing stage"; - case PREFIX(dstSize_tooSmall): return "Destination buffer is too small"; - case PREFIX(srcSize_wrong): return "Src size incorrect"; - case PREFIX(corruption_detected): return "Corrupted block detected"; - case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory"; - case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max possible Symbol Value : too large"; - case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small"; - case PREFIX(dictionary_corrupted): return "Dictionary is corrupted"; - case PREFIX(maxCode): - default: return notErrorCode; /* should be impossible, due to ERR_getError() */ - } -} - - -#if defined (__cplusplus) -} -#endif - -#endif /* ERROR_H_MODULE */ diff --git a/vendor/github.com/DataDog/zstd/error_public.h b/vendor/github.com/DataDog/zstd/error_public.h deleted file mode 100644 index 655e28e0c982..000000000000 --- a/vendor/github.com/DataDog/zstd/error_public.h +++ /dev/null @@ -1,71 +0,0 @@ -/* ****************************************************************** - Error codes list - Copyright (C) 2016, Yann Collet - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - Source repository : https://github.com/Cyan4973/zstd -****************************************************************** */ -#ifndef ERROR_PUBLIC_H_MODULE -#define ERROR_PUBLIC_H_MODULE - -#if defined (__cplusplus) -extern "C" { -#endif - - -/* **************************************** -* error codes list -******************************************/ -typedef enum { - ZSTD_error_no_error, - ZSTD_error_GENERIC, - ZSTD_error_prefix_unknown, - ZSTD_error_frameParameter_unsupported, - ZSTD_error_frameParameter_unsupportedBy32bits, - ZSTD_error_init_missing, - ZSTD_error_memory_allocation, - ZSTD_error_stage_wrong, - ZSTD_error_dstSize_tooSmall, - ZSTD_error_srcSize_wrong, - ZSTD_error_corruption_detected, - ZSTD_error_tableLog_tooLarge, - ZSTD_error_maxSymbolValue_tooLarge, - ZSTD_error_maxSymbolValue_tooSmall, - ZSTD_error_dictionary_corrupted, - ZSTD_error_maxCode -} ZSTD_ErrorCode; - -/* note : functions provide error codes in reverse negative order, - so compare with (size_t)(0-enum) */ - - -#if defined (__cplusplus) -} -#endif - -#endif /* ERROR_PUBLIC_H_MODULE */ diff --git a/vendor/github.com/DataDog/zstd/fse.c b/vendor/github.com/DataDog/zstd/fse.c deleted file mode 100644 index 986a0da15e7e..000000000000 --- a/vendor/github.com/DataDog/zstd/fse.c +++ /dev/null @@ -1,1172 +0,0 @@ -/* ****************************************************************** - FSE : Finite State Entropy coder - Copyright (C) 2013-2015, Yann Collet. - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy - - Public forum : https://groups.google.com/forum/#!forum/lz4c -****************************************************************** */ - -#ifndef FSE_COMMONDEFS_ONLY - -/* ************************************************************** -* Tuning parameters -****************************************************************/ -/*!MEMORY_USAGE : -* Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.) -* Increasing memory usage improves compression ratio -* Reduced memory usage can improve speed, due to cache effect -* Recommended max value is 14, for 16KB, which nicely fits into Intel x86 L1 cache */ -#define FSE_MAX_MEMORY_USAGE 14 -#define FSE_DEFAULT_MEMORY_USAGE 13 - -/*!FSE_MAX_SYMBOL_VALUE : -* Maximum symbol value authorized. -* Required for proper stack allocation */ -#define FSE_MAX_SYMBOL_VALUE 255 - - -/* ************************************************************** -* template functions type & suffix -****************************************************************/ -#define FSE_FUNCTION_TYPE BYTE -#define FSE_FUNCTION_EXTENSION -#define FSE_DECODE_TYPE FSE_decode_t - - -#endif /* !FSE_COMMONDEFS_ONLY */ - -/* ************************************************************** -* Compiler specifics -****************************************************************/ -#ifdef _MSC_VER /* Visual Studio */ -# define FORCE_INLINE static __forceinline -# include /* For Visual 2005 */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# pragma warning(disable : 4214) /* disable: C4214: non-int bitfields */ -#else -# ifdef __GNUC__ -# define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) -# define FORCE_INLINE static inline __attribute__((always_inline)) -# else -# define FORCE_INLINE static inline -# endif -#endif - - -/* ************************************************************** -* Includes -****************************************************************/ -#include /* malloc, free, qsort */ -#include /* memcpy, memset */ -#include /* printf (debug) */ -#include "bitstream.h" -#include "fse_static.h" - - -/* *************************************************************** -* Constants -*****************************************************************/ -#define FSE_MAX_TABLELOG (FSE_MAX_MEMORY_USAGE-2) -#define FSE_MAX_TABLESIZE (1U< FSE_TABLELOG_ABSOLUTE_MAX -#error "FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX is not supported" -#endif - - -/* ************************************************************** -* Error Management -****************************************************************/ -#define FSE_STATIC_ASSERT(c) { enum { FSE_static_assert = 1/(int)(!!(c)) }; } /* use only *after* variable declarations */ - - -/* ************************************************************** -* Complex types -****************************************************************/ -typedef U32 CTable_max_t[FSE_CTABLE_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)]; -typedef U32 DTable_max_t[FSE_DTABLE_SIZE_U32(FSE_MAX_TABLELOG)]; - - -/* ************************************************************** -* Templates -****************************************************************/ -/* - designed to be included - for type-specific functions (template emulation in C) - Objective is to write these functions only once, for improved maintenance -*/ - -/* safety checks */ -#ifndef FSE_FUNCTION_EXTENSION -# error "FSE_FUNCTION_EXTENSION must be defined" -#endif -#ifndef FSE_FUNCTION_TYPE -# error "FSE_FUNCTION_TYPE must be defined" -#endif - -/* Function names */ -#define FSE_CAT(X,Y) X##Y -#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y) -#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y) - - -/* Function templates */ -static U32 FSE_tableStep(U32 tableSize) { return (tableSize>>1) + (tableSize>>3) + 3; } - -size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) -{ - const unsigned tableSize = 1 << tableLog; - const unsigned tableMask = tableSize - 1; - void* const ptr = ct; - U16* const tableU16 = ( (U16*) ptr) + 2; - void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableLog ? tableSize>>1 : 1) ; - FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT); - const unsigned step = FSE_tableStep(tableSize); - unsigned cumul[FSE_MAX_SYMBOL_VALUE+2]; - U32 position = 0; - FSE_FUNCTION_TYPE tableSymbol[FSE_MAX_TABLESIZE]; /* memset() is not necessary, even if static analyzer complain about it */ - U32 highThreshold = tableSize-1; - unsigned symbol; - unsigned i; - - /* header */ - tableU16[-2] = (U16) tableLog; - tableU16[-1] = (U16) maxSymbolValue; - - /* For explanations on how to distribute symbol values over the table : - * http://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */ - - /* symbol start positions */ - cumul[0] = 0; - for (i=1; i<=maxSymbolValue+1; i++) { - if (normalizedCounter[i-1]==-1) { /* Low proba symbol */ - cumul[i] = cumul[i-1] + 1; - tableSymbol[highThreshold--] = (FSE_FUNCTION_TYPE)(i-1); - } else { - cumul[i] = cumul[i-1] + normalizedCounter[i-1]; - } } - cumul[maxSymbolValue+1] = tableSize+1; - - /* Spread symbols */ - for (symbol=0; symbol<=maxSymbolValue; symbol++) { - int nbOccurences; - for (nbOccurences=0; nbOccurences highThreshold) position = (position + step) & tableMask; /* Low proba area */ - } } - - if (position!=0) return ERROR(GENERIC); /* Must have gone through all positions */ - - /* Build table */ - for (i=0; i FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX; - return (FSE_DTable*)malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) ); -} - -void FSE_freeDTable (FSE_DTable* dt) -{ - free(dt); -} - -size_t FSE_buildDTable(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) -{ - FSE_DTableHeader DTableH; - void* const tdPtr = dt+1; /* because dt is unsigned, 32-bits aligned on 32-bits */ - FSE_DECODE_TYPE* const tableDecode = (FSE_DECODE_TYPE*) (tdPtr); - const U32 tableSize = 1 << tableLog; - const U32 tableMask = tableSize-1; - const U32 step = FSE_tableStep(tableSize); - U16 symbolNext[FSE_MAX_SYMBOL_VALUE+1]; - U32 position = 0; - U32 highThreshold = tableSize-1; - const S16 largeLimit= (S16)(1 << (tableLog-1)); - U32 noLarge = 1; - U32 s; - - /* Sanity Checks */ - if (maxSymbolValue > FSE_MAX_SYMBOL_VALUE) return ERROR(maxSymbolValue_tooLarge); - if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge); - - /* Init, lay down lowprob symbols */ - DTableH.tableLog = (U16)tableLog; - for (s=0; s<=maxSymbolValue; s++) { - if (normalizedCounter[s]==-1) { - tableDecode[highThreshold--].symbol = (FSE_FUNCTION_TYPE)s; - symbolNext[s] = 1; - } else { - if (normalizedCounter[s] >= largeLimit) noLarge=0; - symbolNext[s] = normalizedCounter[s]; - } } - - /* Spread symbols */ - for (s=0; s<=maxSymbolValue; s++) { - int i; - for (i=0; i highThreshold) position = (position + step) & tableMask; /* lowprob area */ - } } - - if (position!=0) return ERROR(GENERIC); /* position must reach all cells once, otherwise normalizedCounter is incorrect */ - - /* Build Decoding table */ - { - U32 i; - for (i=0; i> 3) + 3; - return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND; /* maxSymbolValue==0 ? use default */ -} - -static short FSE_abs(short a) { return a<0 ? -a : a; } - -static size_t FSE_writeNCount_generic (void* header, size_t headerBufferSize, - const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, - unsigned writeIsSafe) -{ - BYTE* const ostart = (BYTE*) header; - BYTE* out = ostart; - BYTE* const oend = ostart + headerBufferSize; - int nbBits; - const int tableSize = 1 << tableLog; - int remaining; - int threshold; - U32 bitStream; - int bitCount; - unsigned charnum = 0; - int previous0 = 0; - - bitStream = 0; - bitCount = 0; - /* Table Size */ - bitStream += (tableLog-FSE_MIN_TABLELOG) << bitCount; - bitCount += 4; - - /* Init */ - remaining = tableSize+1; /* +1 for extra accuracy */ - threshold = tableSize; - nbBits = tableLog+1; - - while (remaining>1) { /* stops at 1 */ - if (previous0) { - unsigned start = charnum; - while (!normalizedCounter[charnum]) charnum++; - while (charnum >= start+24) { - start+=24; - bitStream += 0xFFFFU << bitCount; - if ((!writeIsSafe) && (out > oend-2)) return ERROR(dstSize_tooSmall); /* Buffer overflow */ - out[0] = (BYTE) bitStream; - out[1] = (BYTE)(bitStream>>8); - out+=2; - bitStream>>=16; - } - while (charnum >= start+3) { - start+=3; - bitStream += 3 << bitCount; - bitCount += 2; - } - bitStream += (charnum-start) << bitCount; - bitCount += 2; - if (bitCount>16) { - if ((!writeIsSafe) && (out > oend - 2)) return ERROR(dstSize_tooSmall); /* Buffer overflow */ - out[0] = (BYTE)bitStream; - out[1] = (BYTE)(bitStream>>8); - out += 2; - bitStream >>= 16; - bitCount -= 16; - } } - { - short count = normalizedCounter[charnum++]; - const short max = (short)((2*threshold-1)-remaining); - remaining -= FSE_abs(count); - if (remaining<1) return ERROR(GENERIC); - count++; /* +1 for extra accuracy */ - if (count>=threshold) count += max; /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */ - bitStream += count << bitCount; - bitCount += nbBits; - bitCount -= (count>=1; - } - if (bitCount>16) { - if ((!writeIsSafe) && (out > oend - 2)) return ERROR(dstSize_tooSmall); /* Buffer overflow */ - out[0] = (BYTE)bitStream; - out[1] = (BYTE)(bitStream>>8); - out += 2; - bitStream >>= 16; - bitCount -= 16; - } } - - /* flush remaining bitStream */ - if ((!writeIsSafe) && (out > oend - 2)) return ERROR(dstSize_tooSmall); /* Buffer overflow */ - out[0] = (BYTE)bitStream; - out[1] = (BYTE)(bitStream>>8); - out+= (bitCount+7) /8; - - if (charnum > maxSymbolValue + 1) return ERROR(GENERIC); - - return (out-ostart); -} - - -size_t FSE_writeNCount (void* buffer, size_t bufferSize, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) -{ - if (tableLog > FSE_MAX_TABLELOG) return ERROR(GENERIC); /* Unsupported */ - if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC); /* Unsupported */ - - if (bufferSize < FSE_NCountWriteBound(maxSymbolValue, tableLog)) - return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 0); - - return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 1); -} - - -size_t FSE_readNCount (short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, - const void* headerBuffer, size_t hbSize) -{ - const BYTE* const istart = (const BYTE*) headerBuffer; - const BYTE* const iend = istart + hbSize; - const BYTE* ip = istart; - int nbBits; - int remaining; - int threshold; - U32 bitStream; - int bitCount; - unsigned charnum = 0; - int previous0 = 0; - - if (hbSize < 4) return ERROR(srcSize_wrong); - bitStream = MEM_readLE32(ip); - nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG; /* extract tableLog */ - if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge); - bitStream >>= 4; - bitCount = 4; - *tableLogPtr = nbBits; - remaining = (1<1) && (charnum<=*maxSVPtr)) { - if (previous0) { - unsigned n0 = charnum; - while ((bitStream & 0xFFFF) == 0xFFFF) { - n0+=24; - if (ip < iend-5) { - ip+=2; - bitStream = MEM_readLE32(ip) >> bitCount; - } else { - bitStream >>= 16; - bitCount+=16; - } } - while ((bitStream & 3) == 3) { - n0+=3; - bitStream>>=2; - bitCount+=2; - } - n0 += bitStream & 3; - bitCount += 2; - if (n0 > *maxSVPtr) return ERROR(maxSymbolValue_tooSmall); - while (charnum < n0) normalizedCounter[charnum++] = 0; - if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) { - ip += bitCount>>3; - bitCount &= 7; - bitStream = MEM_readLE32(ip) >> bitCount; - } - else - bitStream >>= 2; - } - { - const short max = (short)((2*threshold-1)-remaining); - short count; - - if ((bitStream & (threshold-1)) < (U32)max) { - count = (short)(bitStream & (threshold-1)); - bitCount += nbBits-1; - } else { - count = (short)(bitStream & (2*threshold-1)); - if (count >= threshold) count -= max; - bitCount += nbBits; - } - - count--; /* extra accuracy */ - remaining -= FSE_abs(count); - normalizedCounter[charnum++] = count; - previous0 = !count; - while (remaining < threshold) { - nbBits--; - threshold >>= 1; - } - - if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) { - ip += bitCount>>3; - bitCount &= 7; - } else { - bitCount -= (int)(8 * (iend - 4 - ip)); - ip = iend - 4; - } - bitStream = MEM_readLE32(ip) >> (bitCount & 31); - } } - if (remaining != 1) return ERROR(GENERIC); - *maxSVPtr = charnum-1; - - ip += (bitCount+7)>>3; - if ((size_t)(ip-istart) > hbSize) return ERROR(srcSize_wrong); - return ip-istart; -} - - -/*-************************************************************** -* Counting histogram -****************************************************************/ -/*! FSE_count_simple - This function just counts byte values within @src, - and store the histogram into @count. - This function is unsafe : it doesn't check that all values within @src can fit into @count. - For this reason, prefer using a table @count with 256 elements. - @return : highest count for a single element -*/ -static size_t FSE_count_simple(unsigned* count, unsigned* maxSymbolValuePtr, - const void* src, size_t srcSize) -{ - const BYTE* ip = (const BYTE*)src; - const BYTE* const end = ip + srcSize; - unsigned maxSymbolValue = *maxSymbolValuePtr; - unsigned max=0; - U32 s; - - memset(count, 0, (maxSymbolValue+1)*sizeof(*count)); - if (srcSize==0) { *maxSymbolValuePtr = 0; return 0; } - - while (ip max) max = count[s]; - - return (size_t)max; -} - - -static size_t FSE_count_parallel(unsigned* count, unsigned* maxSymbolValuePtr, - const void* source, size_t sourceSize, - unsigned checkMax) -{ - const BYTE* ip = (const BYTE*)source; - const BYTE* const iend = ip+sourceSize; - unsigned maxSymbolValue = *maxSymbolValuePtr; - unsigned max=0; - U32 s; - - U32 Counting1[256] = { 0 }; - U32 Counting2[256] = { 0 }; - U32 Counting3[256] = { 0 }; - U32 Counting4[256] = { 0 }; - - /* safety checks */ - if (!sourceSize) { - memset(count, 0, maxSymbolValue + 1); - *maxSymbolValuePtr = 0; - return 0; - } - if (!maxSymbolValue) maxSymbolValue = 255; /* 0 == default */ - - { /* by stripes of 16 bytes */ - U32 cached = MEM_read32(ip); ip += 4; - while (ip < iend-15) { - U32 c = cached; cached = MEM_read32(ip); ip += 4; - Counting1[(BYTE) c ]++; - Counting2[(BYTE)(c>>8) ]++; - Counting3[(BYTE)(c>>16)]++; - Counting4[ c>>24 ]++; - c = cached; cached = MEM_read32(ip); ip += 4; - Counting1[(BYTE) c ]++; - Counting2[(BYTE)(c>>8) ]++; - Counting3[(BYTE)(c>>16)]++; - Counting4[ c>>24 ]++; - c = cached; cached = MEM_read32(ip); ip += 4; - Counting1[(BYTE) c ]++; - Counting2[(BYTE)(c>>8) ]++; - Counting3[(BYTE)(c>>16)]++; - Counting4[ c>>24 ]++; - c = cached; cached = MEM_read32(ip); ip += 4; - Counting1[(BYTE) c ]++; - Counting2[(BYTE)(c>>8) ]++; - Counting3[(BYTE)(c>>16)]++; - Counting4[ c>>24 ]++; - } - ip-=4; - } - - /* finish last symbols */ - while (ipmaxSymbolValue; s--) { - Counting1[s] += Counting2[s] + Counting3[s] + Counting4[s]; - if (Counting1[s]) return ERROR(maxSymbolValue_tooSmall); - } } - - for (s=0; s<=maxSymbolValue; s++) { - count[s] = Counting1[s] + Counting2[s] + Counting3[s] + Counting4[s]; - if (count[s] > max) max = count[s]; - } - - while (!count[maxSymbolValue]) maxSymbolValue--; - *maxSymbolValuePtr = maxSymbolValue; - return (size_t)max; -} - -/* fast variant (unsafe : won't check if src contains values beyond count[] limit) */ -size_t FSE_countFast(unsigned* count, unsigned* maxSymbolValuePtr, - const void* source, size_t sourceSize) -{ - if (sourceSize < 1500) return FSE_count_simple(count, maxSymbolValuePtr, source, sourceSize); - return FSE_count_parallel(count, maxSymbolValuePtr, source, sourceSize, 0); -} - -size_t FSE_count(unsigned* count, unsigned* maxSymbolValuePtr, - const void* source, size_t sourceSize) -{ - if (*maxSymbolValuePtr <255) - return FSE_count_parallel(count, maxSymbolValuePtr, source, sourceSize, 1); - *maxSymbolValuePtr = 255; - return FSE_countFast(count, maxSymbolValuePtr, source, sourceSize); -} - - -/*-************************************************************** -* FSE Compression Code -****************************************************************/ -/*! -FSE_CTable is a variable size structure which contains : - U16 tableLog; - U16 maxSymbolValue; - U16 nextStateNumber[1 << tableLog]; // This size is variable - FSE_symbolCompressionTransform symbolTT[maxSymbolValue+1]; // This size is variable -Allocation is manual, since C standard does not support variable-size structures. -*/ - -size_t FSE_sizeof_CTable (unsigned maxSymbolValue, unsigned tableLog) -{ - size_t size; - FSE_STATIC_ASSERT((size_t)FSE_CTABLE_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)*4 >= sizeof(CTable_max_t)); /* A compilation error here means FSE_CTABLE_SIZE_U32 is not large enough */ - if (tableLog > FSE_MAX_TABLELOG) return ERROR(GENERIC); - size = FSE_CTABLE_SIZE_U32 (tableLog, maxSymbolValue) * sizeof(U32); - return size; -} - -FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog) -{ - size_t size; - if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX; - size = FSE_CTABLE_SIZE_U32 (tableLog, maxSymbolValue) * sizeof(U32); - return (FSE_CTable*)malloc(size); -} - -void FSE_freeCTable (FSE_CTable* ct) -{ - free(ct); -} - -/* provides the minimum logSize to safely represent a distribution */ -static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue) -{ - U32 minBitsSrc = BIT_highbit32((U32)(srcSize - 1)) + 1; - U32 minBitsSymbols = BIT_highbit32(maxSymbolValue) + 2; - U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols; - return minBits; -} - -unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue) -{ - U32 maxBitsSrc = BIT_highbit32((U32)(srcSize - 1)) - 2; - U32 tableLog = maxTableLog; - U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue); - if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG; - if (maxBitsSrc < tableLog) tableLog = maxBitsSrc; /* Accuracy can be reduced */ - if (minBits > tableLog) tableLog = minBits; /* Need a minimum to safely represent all symbol values */ - if (tableLog < FSE_MIN_TABLELOG) tableLog = FSE_MIN_TABLELOG; - if (tableLog > FSE_MAX_TABLELOG) tableLog = FSE_MAX_TABLELOG; - return tableLog; -} - - -/* Secondary normalization method. - To be used when primary method fails. */ - -static size_t FSE_normalizeM2(short* norm, U32 tableLog, const unsigned* count, size_t total, U32 maxSymbolValue) -{ - U32 s; - U32 distributed = 0; - U32 ToDistribute; - - /* Init */ - U32 lowThreshold = (U32)(total >> tableLog); - U32 lowOne = (U32)((total * 3) >> (tableLog + 1)); - - for (s=0; s<=maxSymbolValue; s++) { - if (count[s] == 0) { - norm[s]=0; - continue; - } - if (count[s] <= lowThreshold) { - norm[s] = -1; - distributed++; - total -= count[s]; - continue; - } - if (count[s] <= lowOne) { - norm[s] = 1; - distributed++; - total -= count[s]; - continue; - } - norm[s]=-2; - } - ToDistribute = (1 << tableLog) - distributed; - - if ((total / ToDistribute) > lowOne) { - /* risk of rounding to zero */ - lowOne = (U32)((total * 3) / (ToDistribute * 2)); - for (s=0; s<=maxSymbolValue; s++) { - if ((norm[s] == -2) && (count[s] <= lowOne)) { - norm[s] = 1; - distributed++; - total -= count[s]; - continue; - } } - ToDistribute = (1 << tableLog) - distributed; - } - - if (distributed == maxSymbolValue+1) { - /* all values are pretty poor; - probably incompressible data (should have already been detected); - find max, then give all remaining points to max */ - U32 maxV = 0, maxC =0; - for (s=0; s<=maxSymbolValue; s++) - if (count[s] > maxC) maxV=s, maxC=count[s]; - norm[maxV] += (short)ToDistribute; - return 0; - } - - { - U64 const vStepLog = 62 - tableLog; - U64 const mid = (1ULL << (vStepLog-1)) - 1; - U64 const rStep = ((((U64)1<> vStepLog); - U32 sEnd = (U32)(end >> vStepLog); - U32 weight = sEnd - sStart; - if (weight < 1) - return ERROR(GENERIC); - norm[s] = (short)weight; - tmpTotal = end; - } } } - - return 0; -} - - -size_t FSE_normalizeCount (short* normalizedCounter, unsigned tableLog, - const unsigned* count, size_t total, - unsigned maxSymbolValue) -{ - /* Sanity checks */ - if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG; - if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC); /* Unsupported size */ - if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge); /* Unsupported size */ - if (tableLog < FSE_minTableLog(total, maxSymbolValue)) return ERROR(GENERIC); /* Too small tableLog, compression potentially impossible */ - - { - U32 const rtbTable[] = { 0, 473195, 504333, 520860, 550000, 700000, 750000, 830000 }; - U64 const scale = 62 - tableLog; - U64 const step = ((U64)1<<62) / total; /* <== here, one division ! */ - U64 const vStep = 1ULL<<(scale-20); - int stillToDistribute = 1<> tableLog); - - for (s=0; s<=maxSymbolValue; s++) { - if (count[s] == total) return 0; /* rle special case */ - if (count[s] == 0) { normalizedCounter[s]=0; continue; } - if (count[s] <= lowThreshold) { - normalizedCounter[s] = -1; - stillToDistribute--; - } else { - short proba = (short)((count[s]*step) >> scale); - if (proba<8) { - U64 restToBeat = vStep * rtbTable[proba]; - proba += (count[s]*step) - ((U64)proba< restToBeat; - } - if (proba > largestP) largestP=proba, largest=s; - normalizedCounter[s] = proba; - stillToDistribute -= proba; - } } - if (-stillToDistribute >= (normalizedCounter[largest] >> 1)) { - /* corner case, need another normalization method */ - size_t errorCode = FSE_normalizeM2(normalizedCounter, tableLog, count, total, maxSymbolValue); - if (FSE_isError(errorCode)) return errorCode; - } - else normalizedCounter[largest] += (short)stillToDistribute; - } - -#if 0 - { /* Print Table (debug) */ - U32 s; - U32 nTotal = 0; - for (s=0; s<=maxSymbolValue; s++) - printf("%3i: %4i \n", s, normalizedCounter[s]); - for (s=0; s<=maxSymbolValue; s++) - nTotal += abs(normalizedCounter[s]); - if (nTotal != (1U<>1); /* assumption : tableLog >= 1 */ - FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT); - unsigned s; - - /* Sanity checks */ - if (nbBits < 1) return ERROR(GENERIC); /* min size */ - - /* header */ - tableU16[-2] = (U16) nbBits; - tableU16[-1] = (U16) maxSymbolValue; - - /* Build table */ - for (s=0; s FSE_MAX_TABLELOG*4+7 ) && (srcSize & 2)) { /* test bit 2 */ - FSE_encodeSymbol(&bitC, &CState2, *--ip); - FSE_encodeSymbol(&bitC, &CState1, *--ip); - FSE_FLUSHBITS(&bitC); - } - - /* 2 or 4 encoding per loop */ - for ( ; ip>istart ; ) - { - FSE_encodeSymbol(&bitC, &CState2, *--ip); - - if (sizeof(bitC.bitContainer)*8 < FSE_MAX_TABLELOG*2+7 ) /* this test must be static */ - FSE_FLUSHBITS(&bitC); - - FSE_encodeSymbol(&bitC, &CState1, *--ip); - - if (sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) { /* this test must be static */ - FSE_encodeSymbol(&bitC, &CState2, *--ip); - FSE_encodeSymbol(&bitC, &CState1, *--ip); - } - - FSE_FLUSHBITS(&bitC); - } - - FSE_flushCState(&bitC, &CState2); - FSE_flushCState(&bitC, &CState1); - return BIT_closeCStream(&bitC); -} - -size_t FSE_compress_usingCTable (void* dst, size_t dstSize, - const void* src, size_t srcSize, - const FSE_CTable* ct) -{ - const unsigned fast = (dstSize >= FSE_BLOCKBOUND(srcSize)); - - if (fast) - return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 1); - else - return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 0); -} - - -size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); } - -size_t FSE_compress2 (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog) -{ - const BYTE* const istart = (const BYTE*) src; - const BYTE* ip = istart; - - BYTE* const ostart = (BYTE*) dst; - BYTE* op = ostart; - BYTE* const oend = ostart + dstSize; - - U32 count[FSE_MAX_SYMBOL_VALUE+1]; - S16 norm[FSE_MAX_SYMBOL_VALUE+1]; - CTable_max_t ct; - size_t errorCode; - - /* init conditions */ - if (srcSize <= 1) return 0; /* Uncompressible */ - if (!maxSymbolValue) maxSymbolValue = FSE_MAX_SYMBOL_VALUE; - if (!tableLog) tableLog = FSE_DEFAULT_TABLELOG; - - /* Scan input and build symbol stats */ - errorCode = FSE_count (count, &maxSymbolValue, ip, srcSize); - if (FSE_isError(errorCode)) return errorCode; - if (errorCode == srcSize) return 1; - if (errorCode == 1) return 0; /* each symbol only present once */ - if (errorCode < (srcSize >> 7)) return 0; /* Heuristic : not compressible enough */ - - tableLog = FSE_optimalTableLog(tableLog, srcSize, maxSymbolValue); - errorCode = FSE_normalizeCount (norm, tableLog, count, srcSize, maxSymbolValue); - if (FSE_isError(errorCode)) return errorCode; - - /* Write table description header */ - errorCode = FSE_writeNCount (op, oend-op, norm, maxSymbolValue, tableLog); - if (FSE_isError(errorCode)) return errorCode; - op += errorCode; - - /* Compress */ - errorCode = FSE_buildCTable (ct, norm, maxSymbolValue, tableLog); - if (FSE_isError(errorCode)) return errorCode; - errorCode = FSE_compress_usingCTable(op, oend - op, ip, srcSize, ct); - if (errorCode == 0) return 0; /* not enough space for compressed data */ - op += errorCode; - - /* check compressibility */ - if ( (size_t)(op-ostart) >= srcSize-1 ) - return 0; - - return op-ostart; -} - -size_t FSE_compress (void* dst, size_t dstSize, const void* src, size_t srcSize) -{ - return FSE_compress2(dst, dstSize, src, (U32)srcSize, FSE_MAX_SYMBOL_VALUE, FSE_DEFAULT_TABLELOG); -} - - -/*-******************************************************* -* Decompression (Byte symbols) -*********************************************************/ -size_t FSE_buildDTable_rle (FSE_DTable* dt, BYTE symbolValue) -{ - void* ptr = dt; - FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr; - void* dPtr = dt + 1; - FSE_decode_t* const cell = (FSE_decode_t*)dPtr; - - DTableH->tableLog = 0; - DTableH->fastMode = 0; - - cell->newState = 0; - cell->symbol = symbolValue; - cell->nbBits = 0; - - return 0; -} - - -size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits) -{ - void* ptr = dt; - FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr; - void* dPtr = dt + 1; - FSE_decode_t* const dinfo = (FSE_decode_t*)dPtr; - const unsigned tableSize = 1 << nbBits; - const unsigned tableMask = tableSize - 1; - const unsigned maxSymbolValue = tableMask; - unsigned s; - - /* Sanity checks */ - if (nbBits < 1) return ERROR(GENERIC); /* min size */ - - /* Build Decoding Table */ - DTableH->tableLog = (U16)nbBits; - DTableH->fastMode = 1; - for (s=0; s<=maxSymbolValue; s++) { - dinfo[s].newState = 0; - dinfo[s].symbol = (BYTE)s; - dinfo[s].nbBits = (BYTE)nbBits; - } - - return 0; -} - -FORCE_INLINE size_t FSE_decompress_usingDTable_generic( - void* dst, size_t maxDstSize, - const void* cSrc, size_t cSrcSize, - const FSE_DTable* dt, const unsigned fast) -{ - BYTE* const ostart = (BYTE*) dst; - BYTE* op = ostart; - BYTE* const omax = op + maxDstSize; - BYTE* const olimit = omax-3; - - BIT_DStream_t bitD; - FSE_DState_t state1; - FSE_DState_t state2; - size_t errorCode; - - /* Init */ - errorCode = BIT_initDStream(&bitD, cSrc, cSrcSize); /* replaced last arg by maxCompressed Size */ - if (FSE_isError(errorCode)) return errorCode; - - FSE_initDState(&state1, &bitD, dt); - FSE_initDState(&state2, &bitD, dt); - -#define FSE_GETSYMBOL(statePtr) fast ? FSE_decodeSymbolFast(statePtr, &bitD) : FSE_decodeSymbol(statePtr, &bitD) - - /* 4 symbols per loop */ - for ( ; (BIT_reloadDStream(&bitD)==BIT_DStream_unfinished) && (op sizeof(bitD.bitContainer)*8) /* This test must be static */ - BIT_reloadDStream(&bitD); - - op[1] = FSE_GETSYMBOL(&state2); - - if (FSE_MAX_TABLELOG*4+7 > sizeof(bitD.bitContainer)*8) /* This test must be static */ - { if (BIT_reloadDStream(&bitD) > BIT_DStream_unfinished) { op+=2; break; } } - - op[2] = FSE_GETSYMBOL(&state1); - - if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8) /* This test must be static */ - BIT_reloadDStream(&bitD); - - op[3] = FSE_GETSYMBOL(&state2); - } - - /* tail */ - /* note : BIT_reloadDStream(&bitD) >= FSE_DStream_partiallyFilled; Ends at exactly BIT_DStream_completed */ - while (1) { - if ( (BIT_reloadDStream(&bitD)>BIT_DStream_completed) || (op==omax) || (BIT_endOfDStream(&bitD) && (fast || FSE_endOfDState(&state1))) ) - break; - - *op++ = FSE_GETSYMBOL(&state1); - - if ( (BIT_reloadDStream(&bitD)>BIT_DStream_completed) || (op==omax) || (BIT_endOfDStream(&bitD) && (fast || FSE_endOfDState(&state2))) ) - break; - - *op++ = FSE_GETSYMBOL(&state2); - } - - /* end ? */ - if (BIT_endOfDStream(&bitD) && FSE_endOfDState(&state1) && FSE_endOfDState(&state2)) - return op-ostart; - - if (op==omax) return ERROR(dstSize_tooSmall); /* dst buffer is full, but cSrc unfinished */ - - return ERROR(corruption_detected); -} - - -size_t FSE_decompress_usingDTable(void* dst, size_t originalSize, - const void* cSrc, size_t cSrcSize, - const FSE_DTable* dt) -{ - const void* ptr = dt; - const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr; - const U32 fastMode = DTableH->fastMode; - - /* select fast mode (static) */ - if (fastMode) return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 1); - return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 0); -} - - -size_t FSE_decompress(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize) -{ - const BYTE* const istart = (const BYTE*)cSrc; - const BYTE* ip = istart; - short counting[FSE_MAX_SYMBOL_VALUE+1]; - DTable_max_t dt; /* Static analyzer seems unable to understand this table will be properly initialized later */ - unsigned tableLog; - unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE; - size_t errorCode; - - if (cSrcSize<2) return ERROR(srcSize_wrong); /* too small input size */ - - /* normal FSE decoding mode */ - errorCode = FSE_readNCount (counting, &maxSymbolValue, &tableLog, istart, cSrcSize); - if (FSE_isError(errorCode)) return errorCode; - if (errorCode >= cSrcSize) return ERROR(srcSize_wrong); /* too small input size */ - ip += errorCode; - cSrcSize -= errorCode; - - errorCode = FSE_buildDTable (dt, counting, maxSymbolValue, tableLog); - if (FSE_isError(errorCode)) return errorCode; - - /* always return, even if it is an error code */ - return FSE_decompress_usingDTable (dst, maxDstSize, ip, cSrcSize, dt); -} - - - -#endif /* FSE_COMMONDEFS_ONLY */ diff --git a/vendor/github.com/DataDog/zstd/fse.h b/vendor/github.com/DataDog/zstd/fse.h deleted file mode 100644 index db6f49cfae4a..000000000000 --- a/vendor/github.com/DataDog/zstd/fse.h +++ /dev/null @@ -1,295 +0,0 @@ -/* ****************************************************************** - FSE : Finite State Entropy coder - header file - Copyright (C) 2013-2015, Yann Collet. - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - Source repository : https://github.com/Cyan4973/FiniteStateEntropy - - Public forum : https://groups.google.com/forum/#!forum/lz4c -****************************************************************** */ -#ifndef FSE_H -#define FSE_H - -#if defined (__cplusplus) -extern "C" { -#endif - - -/* ***************************************** -* Includes -******************************************/ -#include /* size_t, ptrdiff_t */ - - -/*-**************************************** -* FSE simple functions -******************************************/ -size_t FSE_compress(void* dst, size_t maxDstSize, - const void* src, size_t srcSize); -size_t FSE_decompress(void* dst, size_t maxDstSize, - const void* cSrc, size_t cSrcSize); -/*! -FSE_compress(): - Compress content of buffer 'src', of size 'srcSize', into destination buffer 'dst'. - 'dst' buffer must be already allocated. Compression runs faster is maxDstSize >= FSE_compressBound(srcSize) - return : size of compressed data (<= maxDstSize) - Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!! - if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression instead. - if FSE_isError(return), compression failed (more details using FSE_getErrorName()) - -FSE_decompress(): - Decompress FSE data from buffer 'cSrc', of size 'cSrcSize', - into already allocated destination buffer 'dst', of size 'maxDstSize'. - return : size of regenerated data (<= maxDstSize) - or an error code, which can be tested using FSE_isError() - - ** Important ** : FSE_decompress() doesn't decompress non-compressible nor RLE data !!! - Why ? : making this distinction requires a header. - Header management is intentionally delegated to the user layer, which can better manage special cases. -*/ - - -/* ***************************************** -* Tool functions -******************************************/ -size_t FSE_compressBound(size_t size); /* maximum compressed size */ - -/* Error Management */ -unsigned FSE_isError(size_t code); /* tells if a return value is an error code */ -const char* FSE_getErrorName(size_t code); /* provides error code string (useful for debugging) */ - - -/* ***************************************** -* FSE advanced functions -******************************************/ -/*! -FSE_compress2(): - Same as FSE_compress(), but allows the selection of 'maxSymbolValue' and 'tableLog' - Both parameters can be defined as '0' to mean : use default value - return : size of compressed data - Special values : if return == 0, srcData is not compressible => Nothing is stored within cSrc !!! - if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression. - if FSE_isError(return), it's an error code. -*/ -size_t FSE_compress2 (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog); - - -/* ***************************************** -* FSE detailed API -******************************************/ -/*! -FSE_compress() does the following: -1. count symbol occurrence from source[] into table count[] -2. normalize counters so that sum(count[]) == Power_of_2 (2^tableLog) -3. save normalized counters to memory buffer using writeNCount() -4. build encoding table 'CTable' from normalized counters -5. encode the data stream using encoding table 'CTable' - -FSE_decompress() does the following: -1. read normalized counters with readNCount() -2. build decoding table 'DTable' from normalized counters -3. decode the data stream using decoding table 'DTable' - -The following API allows targeting specific sub-functions for advanced tasks. -For example, it's possible to compress several blocks using the same 'CTable', -or to save and provide normalized distribution using external method. -*/ - -/* *** COMPRESSION *** */ - -/*! -FSE_count(): - Provides the precise count of each byte within a table 'count' - 'count' is a table of unsigned int, of minimum size (*maxSymbolValuePtr+1). - *maxSymbolValuePtr will be updated if detected smaller than initial value. - @return : the count of the most frequent symbol (which is not identified) - if return == srcSize, there is only one symbol. - Can also return an error code, which can be tested with FSE_isError() */ -size_t FSE_count(unsigned* count, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize); - -/*! -FSE_optimalTableLog(): - dynamically downsize 'tableLog' when conditions are met. - It saves CPU time, by using smaller tables, while preserving or even improving compression ratio. - return : recommended tableLog (necessarily <= initial 'tableLog') */ -unsigned FSE_optimalTableLog(unsigned tableLog, size_t srcSize, unsigned maxSymbolValue); - -/*! -FSE_normalizeCount(): - normalize counters so that sum(count[]) == Power_of_2 (2^tableLog) - 'normalizedCounter' is a table of short, of minimum size (maxSymbolValue+1). - return : tableLog, - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_normalizeCount(short* normalizedCounter, unsigned tableLog, const unsigned* count, size_t srcSize, unsigned maxSymbolValue); - -/*! -FSE_NCountWriteBound(): - Provides the maximum possible size of an FSE normalized table, given 'maxSymbolValue' and 'tableLog' - Typically useful for allocation purpose. */ -size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog); - -/*! -FSE_writeNCount(): - Compactly save 'normalizedCounter' into 'buffer'. - return : size of the compressed table - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_writeNCount (void* buffer, size_t bufferSize, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog); - - -/*! -Constructor and Destructor of type FSE_CTable - Note that its size depends on 'tableLog' and 'maxSymbolValue' */ -typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */ -FSE_CTable* FSE_createCTable (unsigned tableLog, unsigned maxSymbolValue); -void FSE_freeCTable (FSE_CTable* ct); - -/*! -FSE_buildCTable(): - Builds @ct, which must be already allocated, using FSE_createCTable() - return : 0 - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog); - -/*! -FSE_compress_usingCTable(): - Compress @src using @ct into @dst which must be already allocated - return : size of compressed data (<= @dstCapacity) - or 0 if compressed data could not fit into @dst - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_compress_usingCTable (void* dst, size_t dstCapacity, const void* src, size_t srcSize, const FSE_CTable* ct); - -/*! -Tutorial : ----------- -The first step is to count all symbols. FSE_count() does this job very fast. -Result will be saved into 'count', a table of unsigned int, which must be already allocated, and have 'maxSymbolValuePtr[0]+1' cells. -'src' is a table of bytes of size 'srcSize'. All values within 'src' MUST be <= maxSymbolValuePtr[0] -maxSymbolValuePtr[0] will be updated, with its real value (necessarily <= original value) -FSE_count() will return the number of occurrence of the most frequent symbol. -This can be used to know if there is a single symbol within 'src', and to quickly evaluate its compressibility. -If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()). - -The next step is to normalize the frequencies. -FSE_normalizeCount() will ensure that sum of frequencies is == 2 ^'tableLog'. -It also guarantees a minimum of 1 to any Symbol with frequency >= 1. -You can use 'tableLog'==0 to mean "use default tableLog value". -If you are unsure of which tableLog value to use, you can ask FSE_optimalTableLog(), -which will provide the optimal valid tableLog given sourceSize, maxSymbolValue, and a user-defined maximum (0 means "default"). - -The result of FSE_normalizeCount() will be saved into a table, -called 'normalizedCounter', which is a table of signed short. -'normalizedCounter' must be already allocated, and have at least 'maxSymbolValue+1' cells. -The return value is tableLog if everything proceeded as expected. -It is 0 if there is a single symbol within distribution. -If there is an error (ex: invalid tableLog value), the function will return an ErrorCode (which can be tested using FSE_isError()). - -'normalizedCounter' can be saved in a compact manner to a memory area using FSE_writeNCount(). -'buffer' must be already allocated. -For guaranteed success, buffer size must be at least FSE_headerBound(). -The result of the function is the number of bytes written into 'buffer'. -If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError(); ex : buffer size too small). - -'normalizedCounter' can then be used to create the compression table 'CTable'. -The space required by 'CTable' must be already allocated, using FSE_createCTable(). -You can then use FSE_buildCTable() to fill 'CTable'. -If there is an error, both functions will return an ErrorCode (which can be tested using FSE_isError()). - -'CTable' can then be used to compress 'src', with FSE_compress_usingCTable(). -Similar to FSE_count(), the convention is that 'src' is assumed to be a table of char of size 'srcSize' -The function returns the size of compressed data (without header), necessarily <= @dstCapacity. -If it returns '0', compressed data could not fit into 'dst'. -If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()). -*/ - - -/* *** DECOMPRESSION *** */ - -/*! -FSE_readNCount(): - Read compactly saved 'normalizedCounter' from 'rBuffer'. - return : size read from 'rBuffer' - or an errorCode, which can be tested using FSE_isError() - maxSymbolValuePtr[0] and tableLogPtr[0] will also be updated with their respective values */ -size_t FSE_readNCount (short* normalizedCounter, unsigned* maxSymbolValuePtr, unsigned* tableLogPtr, const void* rBuffer, size_t rBuffSize); - -/*! -Constructor and Destructor of type FSE_DTable - Note that its size depends on 'tableLog' */ -typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be more restrictive than void* */ -FSE_DTable* FSE_createDTable(unsigned tableLog); -void FSE_freeDTable(FSE_DTable* dt); - -/*! -FSE_buildDTable(): - Builds 'dt', which must be already allocated, using FSE_createDTable() - return : 0, - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_buildDTable (FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog); - -/*! -FSE_decompress_usingDTable(): - Decompress compressed source @cSrc of size @cSrcSize using @dt - into @dst which must be already allocated. - return : size of regenerated data (necessarily <= @dstCapacity) - or an errorCode, which can be tested using FSE_isError() */ -size_t FSE_decompress_usingDTable(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, const FSE_DTable* dt); - -/*! -Tutorial : ----------- -(Note : these functions only decompress FSE-compressed blocks. - If block is uncompressed, use memcpy() instead - If block is a single repeated byte, use memset() instead ) - -The first step is to obtain the normalized frequencies of symbols. -This can be performed by FSE_readNCount() if it was saved using FSE_writeNCount(). -'normalizedCounter' must be already allocated, and have at least 'maxSymbolValuePtr[0]+1' cells of signed short. -In practice, that means it's necessary to know 'maxSymbolValue' beforehand, -or size the table to handle worst case situations (typically 256). -FSE_readNCount() will provide 'tableLog' and 'maxSymbolValue'. -The result of FSE_readNCount() is the number of bytes read from 'rBuffer'. -Note that 'rBufferSize' must be at least 4 bytes, even if useful information is less than that. -If there is an error, the function will return an error code, which can be tested using FSE_isError(). - -The next step is to build the decompression tables 'FSE_DTable' from 'normalizedCounter'. -This is performed by the function FSE_buildDTable(). -The space required by 'FSE_DTable' must be already allocated using FSE_createDTable(). -If there is an error, the function will return an error code, which can be tested using FSE_isError(). - -'FSE_DTable' can then be used to decompress 'cSrc', with FSE_decompress_usingDTable(). -'cSrcSize' must be strictly correct, otherwise decompression will fail. -FSE_decompress_usingDTable() result will tell how many bytes were regenerated (<=maxDstSize). -If there is an error, the function will return an error code, which can be tested using FSE_isError(). (ex: dst buffer too small) -*/ - - -#if defined (__cplusplus) -} -#endif - -#endif /* FSE_H */ diff --git a/vendor/github.com/DataDog/zstd/fse_static.h b/vendor/github.com/DataDog/zstd/fse_static.h deleted file mode 100644 index ca303db848d8..000000000000 --- a/vendor/github.com/DataDog/zstd/fse_static.h +++ /dev/null @@ -1,336 +0,0 @@ -/* ****************************************************************** - FSE : Finite State Entropy coder - header file for static linking (only) - Copyright (C) 2013-2015, Yann Collet - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - Source repository : https://github.com/Cyan4973/FiniteStateEntropy - - Public forum : https://groups.google.com/forum/#!forum/lz4c -****************************************************************** */ -#ifndef FSE_STATIC_H -#define FSE_STATIC_H - -#if defined (__cplusplus) -extern "C" { -#endif - - -/* ***************************************** -* Dependencies -*******************************************/ -#include "fse.h" -#include "bitstream.h" - - -/* ***************************************** -* Static allocation -*******************************************/ -/* FSE buffer bounds */ -#define FSE_NCOUNTBOUND 512 -#define FSE_BLOCKBOUND(size) (size + (size>>7)) -#define FSE_COMPRESSBOUND(size) (FSE_NCOUNTBOUND + FSE_BLOCKBOUND(size)) /* Macro version, useful for static allocation */ - -/* It is possible to statically allocate FSE CTable/DTable as a table of unsigned using below macros */ -#define FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) (1 + (1<<(maxTableLog-1)) + ((maxSymbolValue+1)*2)) -#define FSE_DTABLE_SIZE_U32(maxTableLog) (1 + (1<= BIT_DStream_completed - -When it's done, verify decompression is fully completed, by checking both DStream and the relevant states. -Checking if DStream has reached its end is performed by : - BIT_endOfDStream(&DStream); -Check also the states. There might be some symbols left there, if some high probability ones (>50%) are possible. - FSE_endOfDState(&DState); -*/ - - -/* ***************************************** -* FSE unsafe API -*******************************************/ -static unsigned char FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD); -/* faster, but works only if nbBits is always >= 1 (otherwise, result will be corrupted) */ - - -/* ***************************************** -* Implementation of inlined functions -*******************************************/ -typedef struct { - int deltaFindState; - U32 deltaNbBits; -} FSE_symbolCompressionTransform; /* total 8 bytes */ - -MEM_STATIC void FSE_initCState(FSE_CState_t* statePtr, const FSE_CTable* ct) -{ - const void* ptr = ct; - const U16* u16ptr = (const U16*) ptr; - const U32 tableLog = MEM_read16(ptr); - statePtr->value = (ptrdiff_t)1<stateTable = u16ptr+2; - statePtr->symbolTT = ((const U32*)ct + 1 + (tableLog ? (1<<(tableLog-1)) : 1)); - statePtr->stateLog = tableLog; -} - -MEM_STATIC void FSE_initCState2(FSE_CState_t* statePtr, const FSE_CTable* ct, U32 symbol) -{ - FSE_initCState(statePtr, ct); - { - const FSE_symbolCompressionTransform symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol]; - const U16* stateTable = (const U16*)(statePtr->stateTable); - U32 nbBitsOut = (U32)((symbolTT.deltaNbBits + (1<<15)) >> 16); - statePtr->value = (nbBitsOut << 16) - symbolTT.deltaNbBits; - statePtr->value = stateTable[(statePtr->value >> nbBitsOut) + symbolTT.deltaFindState]; - - } -} - -MEM_STATIC void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* statePtr, U32 symbol) -{ - const FSE_symbolCompressionTransform symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol]; - const U16* const stateTable = (const U16*)(statePtr->stateTable); - U32 nbBitsOut = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16); - BIT_addBits(bitC, statePtr->value, nbBitsOut); - statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState]; -} - -MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr) -{ - BIT_addBits(bitC, statePtr->value, statePtr->stateLog); - BIT_flushBits(bitC); -} - -/* decompression */ - -typedef struct { - U16 tableLog; - U16 fastMode; -} FSE_DTableHeader; /* sizeof U32 */ - -typedef struct -{ - unsigned short newState; - unsigned char symbol; - unsigned char nbBits; -} FSE_decode_t; /* size == U32 */ - -MEM_STATIC void FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt) -{ - const void* ptr = dt; - const FSE_DTableHeader* const DTableH = (const FSE_DTableHeader*)ptr; - DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog); - BIT_reloadDStream(bitD); - DStatePtr->table = dt + 1; -} - -MEM_STATIC size_t FSE_getStateValue(FSE_DState_t* DStatePtr) -{ - return DStatePtr->state; -} - -MEM_STATIC BYTE FSE_peakSymbol(FSE_DState_t* DStatePtr) -{ - const FSE_decode_t DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; - return DInfo.symbol; -} - -MEM_STATIC BYTE FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD) -{ - const FSE_decode_t DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; - const U32 nbBits = DInfo.nbBits; - BYTE symbol = DInfo.symbol; - size_t lowBits = BIT_readBits(bitD, nbBits); - - DStatePtr->state = DInfo.newState + lowBits; - return symbol; -} - -MEM_STATIC BYTE FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD) -{ - const FSE_decode_t DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; - const U32 nbBits = DInfo.nbBits; - BYTE symbol = DInfo.symbol; - size_t lowBits = BIT_readBitsFast(bitD, nbBits); - - DStatePtr->state = DInfo.newState + lowBits; - return symbol; -} - -MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr) -{ - return DStatePtr->state == 0; -} - - -#if defined (__cplusplus) -} -#endif - -#endif /* FSE_STATIC_H */ diff --git a/vendor/github.com/DataDog/zstd/huff0.c b/vendor/github.com/DataDog/zstd/huff0.c deleted file mode 100644 index 929bc87b1569..000000000000 --- a/vendor/github.com/DataDog/zstd/huff0.c +++ /dev/null @@ -1,1728 +0,0 @@ -/* ****************************************************************** - Huff0 : Huffman coder, part of New Generation Entropy library - Copyright (C) 2013-2015, Yann Collet. - - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - FSE+Huff0 source repository : https://github.com/Cyan4973/FiniteStateEntropy - - Public forum : https://groups.google.com/forum/#!forum/lz4c -****************************************************************** */ - -/* ************************************************************** -* Compiler specifics -****************************************************************/ -#if defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) -/* inline is defined */ -#elif defined(_MSC_VER) -# define inline __inline -#else -# define inline /* disable inline */ -#endif - - -#ifdef _MSC_VER /* Visual Studio */ -# define FORCE_INLINE static __forceinline -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -#else -# ifdef __GNUC__ -# define FORCE_INLINE static inline __attribute__((always_inline)) -# else -# define FORCE_INLINE static inline -# endif -#endif - - -/* ************************************************************** -* Includes -****************************************************************/ -#include /* malloc, free, qsort */ -#include /* memcpy, memset */ -#include /* printf (debug) */ -#include "huff0_static.h" -#include "bitstream.h" -#include "fse.h" /* header compression */ - - -/* ************************************************************** -* Constants -****************************************************************/ -#define HUF_ABSOLUTEMAX_TABLELOG 16 /* absolute limit of HUF_MAX_TABLELOG. Beyond that value, code does not work */ -#define HUF_MAX_TABLELOG 12 /* max configured tableLog (for static allocation); can be modified up to HUF_ABSOLUTEMAX_TABLELOG */ -#define HUF_DEFAULT_TABLELOG HUF_MAX_TABLELOG /* tableLog by default, when not specified */ -#define HUF_MAX_SYMBOL_VALUE 255 -#if (HUF_MAX_TABLELOG > HUF_ABSOLUTEMAX_TABLELOG) -# error "HUF_MAX_TABLELOG is too large !" -#endif - - -/* ************************************************************** -* Error Management -****************************************************************/ -unsigned HUF_isError(size_t code) { return ERR_isError(code); } -const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); } -#define HUF_STATIC_ASSERT(c) { enum { HUF_static_assert = 1/(int)(!!(c)) }; } /* use only *after* variable declarations */ - - -/* ******************************************************* -* Huff0 : Huffman block compression -*********************************************************/ -struct HUF_CElt_s { - U16 val; - BYTE nbBits; -}; /* typedef'd to HUF_CElt within huff0_static.h */ - -typedef struct nodeElt_s { - U32 count; - U16 parent; - BYTE byte; - BYTE nbBits; -} nodeElt; - -/*! HUF_writeCTable() : - @dst : destination buffer - @CTable : huffman tree to save, using huff0 representation - @return : size of saved CTable */ -size_t HUF_writeCTable (void* dst, size_t maxDstSize, - const HUF_CElt* CTable, U32 maxSymbolValue, U32 huffLog) -{ - BYTE bitsToWeight[HUF_MAX_TABLELOG + 1]; - BYTE huffWeight[HUF_MAX_SYMBOL_VALUE + 1]; - U32 n; - BYTE* op = (BYTE*)dst; - size_t size; - - /* check conditions */ - if (maxSymbolValue > HUF_MAX_SYMBOL_VALUE + 1) - return ERROR(GENERIC); - - /* convert to weight */ - bitsToWeight[0] = 0; - for (n=1; n<=huffLog; n++) - bitsToWeight[n] = (BYTE)(huffLog + 1 - n); - for (n=0; n= 128) return ERROR(GENERIC); /* should never happen, since maxSymbolValue <= 255 */ - if ((size <= 1) || (size >= maxSymbolValue/2)) { - if (size==1) { /* RLE */ - /* only possible case : serie of 1 (because there are at least 2) */ - /* can only be 2^n or (2^n-1), otherwise not an huffman tree */ - BYTE code; - switch(maxSymbolValue) - { - case 1: code = 0; break; - case 2: code = 1; break; - case 3: code = 2; break; - case 4: code = 3; break; - case 7: code = 4; break; - case 8: code = 5; break; - case 15: code = 6; break; - case 16: code = 7; break; - case 31: code = 8; break; - case 32: code = 9; break; - case 63: code = 10; break; - case 64: code = 11; break; - case 127: code = 12; break; - case 128: code = 13; break; - default : return ERROR(corruption_detected); - } - op[0] = (BYTE)(255-13 + code); - return 1; - } - /* Not compressible */ - if (maxSymbolValue > (241-128)) return ERROR(GENERIC); /* not implemented (not possible with current format) */ - if (((maxSymbolValue+1)/2) + 1 > maxDstSize) return ERROR(dstSize_tooSmall); /* not enough space within dst buffer */ - op[0] = (BYTE)(128 /*special case*/ + 0 /* Not Compressible */ + (maxSymbolValue-1)); - huffWeight[maxSymbolValue] = 0; /* to be sure it doesn't cause issue in final combination */ - for (n=0; n HUF_MAX_TABLELOG) return ERROR(tableLog_tooLarge); - if (nbSymbols > maxSymbolValue+1) return ERROR(maxSymbolValue_tooSmall); - - /* Prepare base value per rank */ - nextRankStart = 0; - for (n=1; n<=tableLog; n++) { - U32 current = nextRankStart; - nextRankStart += (rankVal[n] << (n-1)); - rankVal[n] = current; - } - - /* fill nbBits */ - for (n=0; n0; n--) { - valPerRank[n] = min; /* get starting value within each rank */ - min += nbPerRank[n]; - min >>= 1; - } } - for (n=0; n<=maxSymbolValue; n++) - CTable[n].val = valPerRank[CTable[n].nbBits]++; /* assign value within rank, symbol order */ - } - - return iSize; -} - - -static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits) -{ - int totalCost = 0; - const U32 largestBits = huffNode[lastNonNull].nbBits; - - /* early exit : all is fine */ - if (largestBits <= maxNbBits) return largestBits; - - /* there are several too large elements (at least >= 2) */ - { - const U32 baseCost = 1 << (largestBits - maxNbBits); - U32 n = lastNonNull; - - while (huffNode[n].nbBits > maxNbBits) { - totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits)); - huffNode[n].nbBits = (BYTE)maxNbBits; - n --; - } /* n stops at huffNode[n].nbBits <= maxNbBits */ - while (huffNode[n].nbBits == maxNbBits) n--; /* n end at index of smallest symbol using (maxNbBits-1) */ - - /* renorm totalCost */ - totalCost >>= (largestBits - maxNbBits); /* note : totalCost is necessarily a multiple of baseCost */ - - /* repay normalized cost */ - { - const U32 noSymbol = 0xF0F0F0F0; - U32 rankLast[HUF_MAX_TABLELOG+1]; - U32 currentNbBits = maxNbBits; - int pos; - - /* Get pos of last (smallest) symbol per rank */ - memset(rankLast, 0xF0, sizeof(rankLast)); - for (pos=n ; pos >= 0; pos--) { - if (huffNode[pos].nbBits >= currentNbBits) continue; - currentNbBits = huffNode[pos].nbBits; /* < maxNbBits */ - rankLast[maxNbBits-currentNbBits] = pos; - } - - while (totalCost > 0) { - U32 nBitsToDecrease = BIT_highbit32(totalCost) + 1; - for ( ; nBitsToDecrease > 1; nBitsToDecrease--) { - U32 highPos = rankLast[nBitsToDecrease]; - U32 lowPos = rankLast[nBitsToDecrease-1]; - if (highPos == noSymbol) continue; - if (lowPos == noSymbol) break; - { - U32 highTotal = huffNode[highPos].count; - U32 lowTotal = 2 * huffNode[lowPos].count; - if (highTotal <= lowTotal) break; - } } - /* only triggered when no more rank 1 symbol left => find closest one (note : there is necessarily at least one !) */ - while ((nBitsToDecrease<=HUF_MAX_TABLELOG) && (rankLast[nBitsToDecrease] == noSymbol)) /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */ - nBitsToDecrease ++; - totalCost -= 1 << (nBitsToDecrease-1); - if (rankLast[nBitsToDecrease-1] == noSymbol) - rankLast[nBitsToDecrease-1] = rankLast[nBitsToDecrease]; /* this rank is no longer empty */ - huffNode[rankLast[nBitsToDecrease]].nbBits ++; - if (rankLast[nBitsToDecrease] == 0) /* special case, reached largest symbol */ - rankLast[nBitsToDecrease] = noSymbol; - else { - rankLast[nBitsToDecrease]--; - if (huffNode[rankLast[nBitsToDecrease]].nbBits != maxNbBits-nBitsToDecrease) - rankLast[nBitsToDecrease] = noSymbol; /* this rank is now empty */ - } } - - while (totalCost < 0) { /* Sometimes, cost correction overshoot */ - if (rankLast[1] == noSymbol) { /* special case : no rank 1 symbol (using maxNbBits-1); let's create one from largest rank 0 (using maxNbBits) */ - while (huffNode[n].nbBits == maxNbBits) n--; - huffNode[n+1].nbBits--; - rankLast[1] = n+1; - totalCost++; - continue; - } - huffNode[ rankLast[1] + 1 ].nbBits--; - rankLast[1]++; - totalCost ++; - } } } - - return maxNbBits; -} - - -typedef struct { - U32 base; - U32 current; -} rankPos; - -static void HUF_sort(nodeElt* huffNode, const U32* count, U32 maxSymbolValue) -{ - rankPos rank[32]; - U32 n; - - memset(rank, 0, sizeof(rank)); - for (n=0; n<=maxSymbolValue; n++) { - U32 r = BIT_highbit32(count[n] + 1); - rank[r].base ++; - } - for (n=30; n>0; n--) rank[n-1].base += rank[n].base; - for (n=0; n<32; n++) rank[n].current = rank[n].base; - for (n=0; n<=maxSymbolValue; n++) { - U32 c = count[n]; - U32 r = BIT_highbit32(c+1) + 1; - U32 pos = rank[r].current++; - while ((pos > rank[r].base) && (c > huffNode[pos-1].count)) huffNode[pos]=huffNode[pos-1], pos--; - huffNode[pos].count = c; - huffNode[pos].byte = (BYTE)n; - } -} - - -#define STARTNODE (HUF_MAX_SYMBOL_VALUE+1) -size_t HUF_buildCTable (HUF_CElt* tree, const U32* count, U32 maxSymbolValue, U32 maxNbBits) -{ - nodeElt huffNode0[2*HUF_MAX_SYMBOL_VALUE+1 +1]; - nodeElt* huffNode = huffNode0 + 1; - U32 n, nonNullRank; - int lowS, lowN; - U16 nodeNb = STARTNODE; - U32 nodeRoot; - - /* safety checks */ - if (maxNbBits == 0) maxNbBits = HUF_DEFAULT_TABLELOG; - if (maxSymbolValue > HUF_MAX_SYMBOL_VALUE) return ERROR(GENERIC); - memset(huffNode0, 0, sizeof(huffNode0)); - - /* sort, decreasing order */ - HUF_sort(huffNode, count, maxSymbolValue); - - /* init for parents */ - nonNullRank = maxSymbolValue; - while(huffNode[nonNullRank].count == 0) nonNullRank--; - lowS = nonNullRank; nodeRoot = nodeNb + lowS - 1; lowN = nodeNb; - huffNode[nodeNb].count = huffNode[lowS].count + huffNode[lowS-1].count; - huffNode[lowS].parent = huffNode[lowS-1].parent = nodeNb; - nodeNb++; lowS-=2; - for (n=nodeNb; n<=nodeRoot; n++) huffNode[n].count = (U32)(1U<<30); - huffNode0[0].count = (U32)(1U<<31); - - /* create parents */ - while (nodeNb <= nodeRoot) { - U32 n1 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++; - U32 n2 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++; - huffNode[nodeNb].count = huffNode[n1].count + huffNode[n2].count; - huffNode[n1].parent = huffNode[n2].parent = nodeNb; - nodeNb++; - } - - /* distribute weights (unlimited tree height) */ - huffNode[nodeRoot].nbBits = 0; - for (n=nodeRoot-1; n>=STARTNODE; n--) - huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1; - for (n=0; n<=nonNullRank; n++) - huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1; - - /* enforce maxTableLog */ - maxNbBits = HUF_setMaxHeight(huffNode, nonNullRank, maxNbBits); - - /* fill result into tree (val, nbBits) */ - { - U16 nbPerRank[HUF_MAX_TABLELOG+1] = {0}; - U16 valPerRank[HUF_MAX_TABLELOG+1] = {0}; - if (maxNbBits > HUF_MAX_TABLELOG) return ERROR(GENERIC); /* check fit into table */ - for (n=0; n<=nonNullRank; n++) - nbPerRank[huffNode[n].nbBits]++; - { - /* determine stating value per rank */ - U16 min = 0; - for (n=maxNbBits; n>0; n--) { - valPerRank[n] = min; /* get starting value within each rank */ - min += nbPerRank[n]; - min >>= 1; - } - } - for (n=0; n<=maxSymbolValue; n++) - tree[huffNode[n].byte].nbBits = huffNode[n].nbBits; /* push nbBits per symbol, symbol order */ - for (n=0; n<=maxSymbolValue; n++) - tree[n].val = valPerRank[tree[n].nbBits]++; /* assign value within rank, symbol order */ - } - - return maxNbBits; -} - -static void HUF_encodeSymbol(BIT_CStream_t* bitCPtr, U32 symbol, const HUF_CElt* CTable) -{ - BIT_addBitsFast(bitCPtr, CTable[symbol].val, CTable[symbol].nbBits); -} - -size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); } - -#define HUF_FLUSHBITS(s) (fast ? BIT_flushBitsFast(s) : BIT_flushBits(s)) - -#define HUF_FLUSHBITS_1(stream) \ - if (sizeof((stream)->bitContainer)*8 < HUF_MAX_TABLELOG*2+7) HUF_FLUSHBITS(stream) - -#define HUF_FLUSHBITS_2(stream) \ - if (sizeof((stream)->bitContainer)*8 < HUF_MAX_TABLELOG*4+7) HUF_FLUSHBITS(stream) - -size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable) -{ - const BYTE* ip = (const BYTE*) src; - BYTE* const ostart = (BYTE*)dst; - BYTE* op = ostart; - BYTE* const oend = ostart + dstSize; - size_t n; - const unsigned fast = (dstSize >= HUF_BLOCKBOUND(srcSize)); - size_t errorCode; - BIT_CStream_t bitC; - - /* init */ - if (dstSize < 8) return 0; /* not enough space to compress */ - errorCode = BIT_initCStream(&bitC, op, oend-op); - if (HUF_isError(errorCode)) return 0; - - n = srcSize & ~3; /* join to mod 4 */ - switch (srcSize & 3) - { - case 3 : HUF_encodeSymbol(&bitC, ip[n+ 2], CTable); - HUF_FLUSHBITS_2(&bitC); - case 2 : HUF_encodeSymbol(&bitC, ip[n+ 1], CTable); - HUF_FLUSHBITS_1(&bitC); - case 1 : HUF_encodeSymbol(&bitC, ip[n+ 0], CTable); - HUF_FLUSHBITS(&bitC); - case 0 : - default: ; - } - - for (; n>0; n-=4) { /* note : n&3==0 at this stage */ - HUF_encodeSymbol(&bitC, ip[n- 1], CTable); - HUF_FLUSHBITS_1(&bitC); - HUF_encodeSymbol(&bitC, ip[n- 2], CTable); - HUF_FLUSHBITS_2(&bitC); - HUF_encodeSymbol(&bitC, ip[n- 3], CTable); - HUF_FLUSHBITS_1(&bitC); - HUF_encodeSymbol(&bitC, ip[n- 4], CTable); - HUF_FLUSHBITS(&bitC); - } - - return BIT_closeCStream(&bitC); -} - - -size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable) -{ - size_t segmentSize = (srcSize+3)/4; /* first 3 segments */ - size_t errorCode; - const BYTE* ip = (const BYTE*) src; - const BYTE* const iend = ip + srcSize; - BYTE* const ostart = (BYTE*) dst; - BYTE* op = ostart; - BYTE* const oend = ostart + dstSize; - - if (dstSize < 6 + 1 + 1 + 1 + 8) return 0; /* minimum space to compress successfully */ - if (srcSize < 12) return 0; /* no saving possible : too small input */ - op += 6; /* jumpTable */ - - errorCode = HUF_compress1X_usingCTable(op, oend-op, ip, segmentSize, CTable); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode==0) return 0; - MEM_writeLE16(ostart, (U16)errorCode); - - ip += segmentSize; - op += errorCode; - errorCode = HUF_compress1X_usingCTable(op, oend-op, ip, segmentSize, CTable); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode==0) return 0; - MEM_writeLE16(ostart+2, (U16)errorCode); - - ip += segmentSize; - op += errorCode; - errorCode = HUF_compress1X_usingCTable(op, oend-op, ip, segmentSize, CTable); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode==0) return 0; - MEM_writeLE16(ostart+4, (U16)errorCode); - - ip += segmentSize; - op += errorCode; - errorCode = HUF_compress1X_usingCTable(op, oend-op, ip, iend-ip, CTable); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode==0) return 0; - - op += errorCode; - return op-ostart; -} - - -static size_t HUF_compress_internal ( - void* dst, size_t dstSize, - const void* src, size_t srcSize, - unsigned maxSymbolValue, unsigned huffLog, - unsigned singleStream) -{ - BYTE* const ostart = (BYTE*)dst; - BYTE* op = ostart; - BYTE* const oend = ostart + dstSize; - - U32 count[HUF_MAX_SYMBOL_VALUE+1]; - HUF_CElt CTable[HUF_MAX_SYMBOL_VALUE+1]; - size_t errorCode; - - /* checks & inits */ - if (srcSize < 1) return 0; /* Uncompressed - note : 1 means rle, so first byte must be correct */ - if (dstSize < 1) return 0; /* not compressible within dst budget */ - if (srcSize > 128 * 1024) return ERROR(srcSize_wrong); /* current block size limit */ - if (huffLog > HUF_MAX_TABLELOG) return ERROR(tableLog_tooLarge); - if (!maxSymbolValue) maxSymbolValue = HUF_MAX_SYMBOL_VALUE; - if (!huffLog) huffLog = HUF_DEFAULT_TABLELOG; - - /* Scan input and build symbol stats */ - errorCode = FSE_count (count, &maxSymbolValue, (const BYTE*)src, srcSize); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; } - if (errorCode <= (srcSize >> 7)+1) return 0; /* Heuristic : not compressible enough */ - - /* Build Huffman Tree */ - errorCode = HUF_buildCTable (CTable, count, maxSymbolValue, huffLog); - if (HUF_isError(errorCode)) return errorCode; - huffLog = (U32)errorCode; - - /* Write table description header */ - errorCode = HUF_writeCTable (op, dstSize, CTable, maxSymbolValue, huffLog); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode + 12 >= srcSize) return 0; /* not useful to try compression */ - op += errorCode; - - /* Compress */ - if (singleStream) - errorCode = HUF_compress1X_usingCTable(op, oend - op, src, srcSize, CTable); /* single segment */ - else - errorCode = HUF_compress4X_usingCTable(op, oend - op, src, srcSize, CTable); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode==0) return 0; - op += errorCode; - - /* check compressibility */ - if ((size_t)(op-ostart) >= srcSize-1) - return 0; - - return op-ostart; -} - - -size_t HUF_compress1X (void* dst, size_t dstSize, - const void* src, size_t srcSize, - unsigned maxSymbolValue, unsigned huffLog) -{ - return HUF_compress_internal(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, 1); -} - -size_t HUF_compress2 (void* dst, size_t dstSize, - const void* src, size_t srcSize, - unsigned maxSymbolValue, unsigned huffLog) -{ - return HUF_compress_internal(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, 0); -} - - -size_t HUF_compress (void* dst, size_t maxDstSize, const void* src, size_t srcSize) -{ - return HUF_compress2(dst, maxDstSize, src, (U32)srcSize, 255, HUF_DEFAULT_TABLELOG); -} - - -/* ******************************************************* -* Huff0 : Huffman block decompression -*********************************************************/ -typedef struct { BYTE byte; BYTE nbBits; } HUF_DEltX2; /* single-symbol decoding */ - -typedef struct { U16 sequence; BYTE nbBits; BYTE length; } HUF_DEltX4; /* double-symbols decoding */ - -typedef struct { BYTE symbol; BYTE weight; } sortedSymbol_t; - -/*! HUF_readStats - Read compact Huffman tree, saved by HUF_writeCTable - @huffWeight : destination buffer - @return : size read from `src` -*/ -static size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats, - U32* nbSymbolsPtr, U32* tableLogPtr, - const void* src, size_t srcSize) -{ - U32 weightTotal; - U32 tableLog; - const BYTE* ip = (const BYTE*) src; - size_t iSize = ip[0]; - size_t oSize; - U32 n; - - //memset(huffWeight, 0, hwSize); /* is not necessary, even though some analyzer complain ... */ - - if (iSize >= 128) { /* special header */ - if (iSize >= (242)) { /* RLE */ - static int l[14] = { 1, 2, 3, 4, 7, 8, 15, 16, 31, 32, 63, 64, 127, 128 }; - oSize = l[iSize-242]; - memset(huffWeight, 1, hwSize); - iSize = 0; - } - else { /* Incompressible */ - oSize = iSize - 127; - iSize = ((oSize+1)/2); - if (iSize+1 > srcSize) return ERROR(srcSize_wrong); - if (oSize >= hwSize) return ERROR(corruption_detected); - ip += 1; - for (n=0; n> 4; - huffWeight[n+1] = ip[n/2] & 15; - } } } - else { /* header compressed with FSE (normal case) */ - if (iSize+1 > srcSize) return ERROR(srcSize_wrong); - oSize = FSE_decompress(huffWeight, hwSize-1, ip+1, iSize); /* max (hwSize-1) values decoded, as last one is implied */ - if (FSE_isError(oSize)) return oSize; - } - - /* collect weight stats */ - memset(rankStats, 0, (HUF_ABSOLUTEMAX_TABLELOG + 1) * sizeof(U32)); - weightTotal = 0; - for (n=0; n= HUF_ABSOLUTEMAX_TABLELOG) return ERROR(corruption_detected); - rankStats[huffWeight[n]]++; - weightTotal += (1 << huffWeight[n]) >> 1; - } - - /* get last non-null symbol weight (implied, total must be 2^n) */ - tableLog = BIT_highbit32(weightTotal) + 1; - if (tableLog > HUF_ABSOLUTEMAX_TABLELOG) return ERROR(corruption_detected); - { /* determine last weight */ - U32 total = 1 << tableLog; - U32 rest = total - weightTotal; - U32 verif = 1 << BIT_highbit32(rest); - U32 lastWeight = BIT_highbit32(rest) + 1; - if (verif != rest) return ERROR(corruption_detected); /* last value must be a clean power of 2 */ - huffWeight[oSize] = (BYTE)lastWeight; - rankStats[lastWeight]++; - } - - /* check tree construction validity */ - if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected); /* by construction : at least 2 elts of rank 1, must be even */ - - /* results */ - *nbSymbolsPtr = (U32)(oSize+1); - *tableLogPtr = tableLog; - return iSize+1; -} - - -/*-***************************/ -/* single-symbol decoding */ -/*-***************************/ - -size_t HUF_readDTableX2 (U16* DTable, const void* src, size_t srcSize) -{ - BYTE huffWeight[HUF_MAX_SYMBOL_VALUE + 1]; - U32 rankVal[HUF_ABSOLUTEMAX_TABLELOG + 1]; /* large enough for values from 0 to 16 */ - U32 tableLog = 0; - size_t iSize; - U32 nbSymbols = 0; - U32 n; - U32 nextRankStart; - void* const dtPtr = DTable + 1; - HUF_DEltX2* const dt = (HUF_DEltX2*)dtPtr; - - HUF_STATIC_ASSERT(sizeof(HUF_DEltX2) == sizeof(U16)); /* if compilation fails here, assertion is false */ - //memset(huffWeight, 0, sizeof(huffWeight)); /* is not necessary, even though some analyzer complain ... */ - - iSize = HUF_readStats(huffWeight, HUF_MAX_SYMBOL_VALUE + 1, rankVal, &nbSymbols, &tableLog, src, srcSize); - if (HUF_isError(iSize)) return iSize; - - /* check result */ - if (tableLog > DTable[0]) return ERROR(tableLog_tooLarge); /* DTable is too small */ - DTable[0] = (U16)tableLog; /* maybe should separate sizeof allocated DTable, from used size of DTable, in case of re-use */ - - /* Prepare ranks */ - nextRankStart = 0; - for (n=1; n<=tableLog; n++) { - U32 current = nextRankStart; - nextRankStart += (rankVal[n] << (n-1)); - rankVal[n] = current; - } - - /* fill DTable */ - for (n=0; n> 1; - U32 i; - HUF_DEltX2 D; - D.byte = (BYTE)n; D.nbBits = (BYTE)(tableLog + 1 - w); - for (i = rankVal[w]; i < rankVal[w] + length; i++) - dt[i] = D; - rankVal[w] += length; - } - - return iSize; -} - -static BYTE HUF_decodeSymbolX2(BIT_DStream_t* Dstream, const HUF_DEltX2* dt, const U32 dtLog) -{ - const size_t val = BIT_lookBitsFast(Dstream, dtLog); /* note : dtLog >= 1 */ - const BYTE c = dt[val].byte; - BIT_skipBits(Dstream, dt[val].nbBits); - return c; -} - -#define HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) \ - *ptr++ = HUF_decodeSymbolX2(DStreamPtr, dt, dtLog) - -#define HUF_DECODE_SYMBOLX2_1(ptr, DStreamPtr) \ - if (MEM_64bits() || (HUF_MAX_TABLELOG<=12)) \ - HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) - -#define HUF_DECODE_SYMBOLX2_2(ptr, DStreamPtr) \ - if (MEM_64bits()) \ - HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) - -static inline size_t HUF_decodeStreamX2(BYTE* p, BIT_DStream_t* const bitDPtr, BYTE* const pEnd, const HUF_DEltX2* const dt, const U32 dtLog) -{ - BYTE* const pStart = p; - - /* up to 4 symbols at a time */ - while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) && (p <= pEnd-4)) { - HUF_DECODE_SYMBOLX2_2(p, bitDPtr); - HUF_DECODE_SYMBOLX2_1(p, bitDPtr); - HUF_DECODE_SYMBOLX2_2(p, bitDPtr); - HUF_DECODE_SYMBOLX2_0(p, bitDPtr); - } - - /* closer to the end */ - while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) && (p < pEnd)) - HUF_DECODE_SYMBOLX2_0(p, bitDPtr); - - /* no more data to retrieve from bitstream, hence no need to reload */ - while (p < pEnd) - HUF_DECODE_SYMBOLX2_0(p, bitDPtr); - - return pEnd-pStart; -} - -size_t HUF_decompress1X2_usingDTable( - void* dst, size_t dstSize, - const void* cSrc, size_t cSrcSize, - const U16* DTable) -{ - BYTE* op = (BYTE*)dst; - BYTE* const oend = op + dstSize; - size_t errorCode; - const U32 dtLog = DTable[0]; - const void* dtPtr = DTable; - const HUF_DEltX2* const dt = ((const HUF_DEltX2*)dtPtr)+1; - BIT_DStream_t bitD; - errorCode = BIT_initDStream(&bitD, cSrc, cSrcSize); - if (HUF_isError(errorCode)) return errorCode; - - HUF_decodeStreamX2(op, &bitD, oend, dt, dtLog); - - /* check */ - if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected); - - return dstSize; -} - -size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize) -{ - HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_MAX_TABLELOG); - const BYTE* ip = (const BYTE*) cSrc; - size_t errorCode; - - errorCode = HUF_readDTableX2 (DTable, cSrc, cSrcSize); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode >= cSrcSize) return ERROR(srcSize_wrong); - ip += errorCode; - cSrcSize -= errorCode; - - return HUF_decompress1X2_usingDTable (dst, dstSize, ip, cSrcSize, DTable); -} - - -size_t HUF_decompress4X2_usingDTable( - void* dst, size_t dstSize, - const void* cSrc, size_t cSrcSize, - const U16* DTable) -{ - const BYTE* const istart = (const BYTE*) cSrc; - BYTE* const ostart = (BYTE*) dst; - BYTE* const oend = ostart + dstSize; - const void* const dtPtr = DTable; - const HUF_DEltX2* const dt = ((const HUF_DEltX2*)dtPtr) +1; - const U32 dtLog = DTable[0]; - size_t errorCode; - - /* Check */ - if (cSrcSize < 10) return ERROR(corruption_detected); /* strict minimum : jump table + 1 byte per stream */ - - /* Init */ - BIT_DStream_t bitD1; - BIT_DStream_t bitD2; - BIT_DStream_t bitD3; - BIT_DStream_t bitD4; - const size_t length1 = MEM_readLE16(istart); - const size_t length2 = MEM_readLE16(istart+2); - const size_t length3 = MEM_readLE16(istart+4); - size_t length4; - const BYTE* const istart1 = istart + 6; /* jumpTable */ - const BYTE* const istart2 = istart1 + length1; - const BYTE* const istart3 = istart2 + length2; - const BYTE* const istart4 = istart3 + length3; - const size_t segmentSize = (dstSize+3) / 4; - BYTE* const opStart2 = ostart + segmentSize; - BYTE* const opStart3 = opStart2 + segmentSize; - BYTE* const opStart4 = opStart3 + segmentSize; - BYTE* op1 = ostart; - BYTE* op2 = opStart2; - BYTE* op3 = opStart3; - BYTE* op4 = opStart4; - U32 endSignal; - - length4 = cSrcSize - (length1 + length2 + length3 + 6); - if (length4 > cSrcSize) return ERROR(corruption_detected); /* overflow */ - errorCode = BIT_initDStream(&bitD1, istart1, length1); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD2, istart2, length2); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD3, istart3, length3); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD4, istart4, length4); - if (HUF_isError(errorCode)) return errorCode; - - /* 16-32 symbols per loop (4-8 symbols per stream) */ - endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4); - for ( ; (endSignal==BIT_DStream_unfinished) && (op4<(oend-7)) ; ) { - HUF_DECODE_SYMBOLX2_2(op1, &bitD1); - HUF_DECODE_SYMBOLX2_2(op2, &bitD2); - HUF_DECODE_SYMBOLX2_2(op3, &bitD3); - HUF_DECODE_SYMBOLX2_2(op4, &bitD4); - HUF_DECODE_SYMBOLX2_1(op1, &bitD1); - HUF_DECODE_SYMBOLX2_1(op2, &bitD2); - HUF_DECODE_SYMBOLX2_1(op3, &bitD3); - HUF_DECODE_SYMBOLX2_1(op4, &bitD4); - HUF_DECODE_SYMBOLX2_2(op1, &bitD1); - HUF_DECODE_SYMBOLX2_2(op2, &bitD2); - HUF_DECODE_SYMBOLX2_2(op3, &bitD3); - HUF_DECODE_SYMBOLX2_2(op4, &bitD4); - HUF_DECODE_SYMBOLX2_0(op1, &bitD1); - HUF_DECODE_SYMBOLX2_0(op2, &bitD2); - HUF_DECODE_SYMBOLX2_0(op3, &bitD3); - HUF_DECODE_SYMBOLX2_0(op4, &bitD4); - endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4); - } - - /* check corruption */ - if (op1 > opStart2) return ERROR(corruption_detected); - if (op2 > opStart3) return ERROR(corruption_detected); - if (op3 > opStart4) return ERROR(corruption_detected); - /* note : op4 supposed already verified within main loop */ - - /* finish bitStreams one by one */ - HUF_decodeStreamX2(op1, &bitD1, opStart2, dt, dtLog); - HUF_decodeStreamX2(op2, &bitD2, opStart3, dt, dtLog); - HUF_decodeStreamX2(op3, &bitD3, opStart4, dt, dtLog); - HUF_decodeStreamX2(op4, &bitD4, oend, dt, dtLog); - - /* check */ - endSignal = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4); - if (!endSignal) return ERROR(corruption_detected); - - /* decoded size */ - return dstSize; -} - - -size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize) -{ - HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_MAX_TABLELOG); - const BYTE* ip = (const BYTE*) cSrc; - size_t errorCode; - - errorCode = HUF_readDTableX2 (DTable, cSrc, cSrcSize); - if (HUF_isError(errorCode)) return errorCode; - if (errorCode >= cSrcSize) return ERROR(srcSize_wrong); - ip += errorCode; - cSrcSize -= errorCode; - - return HUF_decompress4X2_usingDTable (dst, dstSize, ip, cSrcSize, DTable); -} - - -/* *************************/ -/* double-symbols decoding */ -/* *************************/ - -static void HUF_fillDTableX4Level2(HUF_DEltX4* DTable, U32 sizeLog, const U32 consumed, - const U32* rankValOrigin, const int minWeight, - const sortedSymbol_t* sortedSymbols, const U32 sortedListSize, - U32 nbBitsBaseline, U16 baseSeq) -{ - HUF_DEltX4 DElt; - U32 rankVal[HUF_ABSOLUTEMAX_TABLELOG + 1]; - U32 s; - - /* get pre-calculated rankVal */ - memcpy(rankVal, rankValOrigin, sizeof(rankVal)); - - /* fill skipped values */ - if (minWeight>1) { - U32 i, skipSize = rankVal[minWeight]; - MEM_writeLE16(&(DElt.sequence), baseSeq); - DElt.nbBits = (BYTE)(consumed); - DElt.length = 1; - for (i = 0; i < skipSize; i++) - DTable[i] = DElt; - } - - /* fill DTable */ - for (s=0; s= 1 */ - - rankVal[weight] += length; - } -} - -typedef U32 rankVal_t[HUF_ABSOLUTEMAX_TABLELOG][HUF_ABSOLUTEMAX_TABLELOG + 1]; - -static void HUF_fillDTableX4(HUF_DEltX4* DTable, const U32 targetLog, - const sortedSymbol_t* sortedList, const U32 sortedListSize, - const U32* rankStart, rankVal_t rankValOrigin, const U32 maxWeight, - const U32 nbBitsBaseline) -{ - U32 rankVal[HUF_ABSOLUTEMAX_TABLELOG + 1]; - const int scaleLog = nbBitsBaseline - targetLog; /* note : targetLog >= srcLog, hence scaleLog <= 1 */ - const U32 minBits = nbBitsBaseline - maxWeight; - U32 s; - - memcpy(rankVal, rankValOrigin, sizeof(rankVal)); - - /* fill DTable */ - for (s=0; s= minBits) { /* enough room for a second symbol */ - U32 sortedRank; - int minWeight = nbBits + scaleLog; - if (minWeight < 1) minWeight = 1; - sortedRank = rankStart[minWeight]; - HUF_fillDTableX4Level2(DTable+start, targetLog-nbBits, nbBits, - rankValOrigin[nbBits], minWeight, - sortedList+sortedRank, sortedListSize-sortedRank, - nbBitsBaseline, symbol); - } else { - U32 i; - const U32 end = start + length; - HUF_DEltX4 DElt; - - MEM_writeLE16(&(DElt.sequence), symbol); - DElt.nbBits = (BYTE)(nbBits); - DElt.length = 1; - for (i = start; i < end; i++) - DTable[i] = DElt; - } - rankVal[weight] += length; - } -} - -size_t HUF_readDTableX4 (U32* DTable, const void* src, size_t srcSize) -{ - BYTE weightList[HUF_MAX_SYMBOL_VALUE + 1]; - sortedSymbol_t sortedSymbol[HUF_MAX_SYMBOL_VALUE + 1]; - U32 rankStats[HUF_ABSOLUTEMAX_TABLELOG + 1] = { 0 }; - U32 rankStart0[HUF_ABSOLUTEMAX_TABLELOG + 2] = { 0 }; - U32* const rankStart = rankStart0+1; - rankVal_t rankVal; - U32 tableLog, maxW, sizeOfSort, nbSymbols; - const U32 memLog = DTable[0]; - size_t iSize; - void* dtPtr = DTable; - HUF_DEltX4* const dt = ((HUF_DEltX4*)dtPtr) + 1; - - HUF_STATIC_ASSERT(sizeof(HUF_DEltX4) == sizeof(U32)); /* if compilation fails here, assertion is false */ - if (memLog > HUF_ABSOLUTEMAX_TABLELOG) return ERROR(tableLog_tooLarge); - //memset(weightList, 0, sizeof(weightList)); /* is not necessary, even though some analyzer complain ... */ - - iSize = HUF_readStats(weightList, HUF_MAX_SYMBOL_VALUE + 1, rankStats, &nbSymbols, &tableLog, src, srcSize); - if (HUF_isError(iSize)) return iSize; - - /* check result */ - if (tableLog > memLog) return ERROR(tableLog_tooLarge); /* DTable can't fit code depth */ - - /* find maxWeight */ - for (maxW = tableLog; rankStats[maxW]==0; maxW--) {} /* necessarily finds a solution before 0 */ - - /* Get start index of each weight */ - { - U32 w, nextRankStart = 0; - for (w=1; w<=maxW; w++) { - U32 current = nextRankStart; - nextRankStart += rankStats[w]; - rankStart[w] = current; - } - rankStart[0] = nextRankStart; /* put all 0w symbols at the end of sorted list*/ - sizeOfSort = nextRankStart; - } - - /* sort symbols by weight */ - { - U32 s; - for (s=0; s> consumed; - } } } - - HUF_fillDTableX4(dt, memLog, - sortedSymbol, sizeOfSort, - rankStart0, rankVal, maxW, - tableLog+1); - - return iSize; -} - - -static U32 HUF_decodeSymbolX4(void* op, BIT_DStream_t* DStream, const HUF_DEltX4* dt, const U32 dtLog) -{ - const size_t val = BIT_lookBitsFast(DStream, dtLog); /* note : dtLog >= 1 */ - memcpy(op, dt+val, 2); - BIT_skipBits(DStream, dt[val].nbBits); - return dt[val].length; -} - -static U32 HUF_decodeLastSymbolX4(void* op, BIT_DStream_t* DStream, const HUF_DEltX4* dt, const U32 dtLog) -{ - const size_t val = BIT_lookBitsFast(DStream, dtLog); /* note : dtLog >= 1 */ - memcpy(op, dt+val, 1); - if (dt[val].length==1) BIT_skipBits(DStream, dt[val].nbBits); - else { - if (DStream->bitsConsumed < (sizeof(DStream->bitContainer)*8)) { - BIT_skipBits(DStream, dt[val].nbBits); - if (DStream->bitsConsumed > (sizeof(DStream->bitContainer)*8)) - DStream->bitsConsumed = (sizeof(DStream->bitContainer)*8); /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */ - } } - return 1; -} - - -#define HUF_DECODE_SYMBOLX4_0(ptr, DStreamPtr) \ - ptr += HUF_decodeSymbolX4(ptr, DStreamPtr, dt, dtLog) - -#define HUF_DECODE_SYMBOLX4_1(ptr, DStreamPtr) \ - if (MEM_64bits() || (HUF_MAX_TABLELOG<=12)) \ - ptr += HUF_decodeSymbolX4(ptr, DStreamPtr, dt, dtLog) - -#define HUF_DECODE_SYMBOLX4_2(ptr, DStreamPtr) \ - if (MEM_64bits()) \ - ptr += HUF_decodeSymbolX4(ptr, DStreamPtr, dt, dtLog) - -static inline size_t HUF_decodeStreamX4(BYTE* p, BIT_DStream_t* bitDPtr, BYTE* const pEnd, const HUF_DEltX4* const dt, const U32 dtLog) -{ - BYTE* const pStart = p; - - /* up to 8 symbols at a time */ - while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) && (p < pEnd-7)) { - HUF_DECODE_SYMBOLX4_2(p, bitDPtr); - HUF_DECODE_SYMBOLX4_1(p, bitDPtr); - HUF_DECODE_SYMBOLX4_2(p, bitDPtr); - HUF_DECODE_SYMBOLX4_0(p, bitDPtr); - } - - /* closer to the end */ - while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) && (p <= pEnd-2)) - HUF_DECODE_SYMBOLX4_0(p, bitDPtr); - - while (p <= pEnd-2) - HUF_DECODE_SYMBOLX4_0(p, bitDPtr); /* no need to reload : reached the end of DStream */ - - if (p < pEnd) - p += HUF_decodeLastSymbolX4(p, bitDPtr, dt, dtLog); - - return p-pStart; -} - - -size_t HUF_decompress1X4_usingDTable( - void* dst, size_t dstSize, - const void* cSrc, size_t cSrcSize, - const U32* DTable) -{ - const BYTE* const istart = (const BYTE*) cSrc; - BYTE* const ostart = (BYTE*) dst; - BYTE* const oend = ostart + dstSize; - - const U32 dtLog = DTable[0]; - const void* const dtPtr = DTable; - const HUF_DEltX4* const dt = ((const HUF_DEltX4*)dtPtr) +1; - size_t errorCode; - - /* Init */ - BIT_DStream_t bitD; - errorCode = BIT_initDStream(&bitD, istart, cSrcSize); - if (HUF_isError(errorCode)) return errorCode; - - /* finish bitStreams one by one */ - HUF_decodeStreamX4(ostart, &bitD, oend, dt, dtLog); - - /* check */ - if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected); - - /* decoded size */ - return dstSize; -} - -size_t HUF_decompress1X4 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize) -{ - HUF_CREATE_STATIC_DTABLEX4(DTable, HUF_MAX_TABLELOG); - const BYTE* ip = (const BYTE*) cSrc; - - size_t hSize = HUF_readDTableX4 (DTable, cSrc, cSrcSize); - if (HUF_isError(hSize)) return hSize; - if (hSize >= cSrcSize) return ERROR(srcSize_wrong); - ip += hSize; - cSrcSize -= hSize; - - return HUF_decompress1X4_usingDTable (dst, dstSize, ip, cSrcSize, DTable); -} - -size_t HUF_decompress4X4_usingDTable( - void* dst, size_t dstSize, - const void* cSrc, size_t cSrcSize, - const U32* DTable) -{ - if (cSrcSize < 10) return ERROR(corruption_detected); /* strict minimum : jump table + 1 byte per stream */ - - { - const BYTE* const istart = (const BYTE*) cSrc; - BYTE* const ostart = (BYTE*) dst; - BYTE* const oend = ostart + dstSize; - const void* const dtPtr = DTable; - const HUF_DEltX4* const dt = ((const HUF_DEltX4*)dtPtr) +1; - const U32 dtLog = DTable[0]; - size_t errorCode; - - /* Init */ - BIT_DStream_t bitD1; - BIT_DStream_t bitD2; - BIT_DStream_t bitD3; - BIT_DStream_t bitD4; - const size_t length1 = MEM_readLE16(istart); - const size_t length2 = MEM_readLE16(istart+2); - const size_t length3 = MEM_readLE16(istart+4); - size_t length4; - const BYTE* const istart1 = istart + 6; /* jumpTable */ - const BYTE* const istart2 = istart1 + length1; - const BYTE* const istart3 = istart2 + length2; - const BYTE* const istart4 = istart3 + length3; - const size_t segmentSize = (dstSize+3) / 4; - BYTE* const opStart2 = ostart + segmentSize; - BYTE* const opStart3 = opStart2 + segmentSize; - BYTE* const opStart4 = opStart3 + segmentSize; - BYTE* op1 = ostart; - BYTE* op2 = opStart2; - BYTE* op3 = opStart3; - BYTE* op4 = opStart4; - U32 endSignal; - - length4 = cSrcSize - (length1 + length2 + length3 + 6); - if (length4 > cSrcSize) return ERROR(corruption_detected); /* overflow */ - errorCode = BIT_initDStream(&bitD1, istart1, length1); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD2, istart2, length2); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD3, istart3, length3); - if (HUF_isError(errorCode)) return errorCode; - errorCode = BIT_initDStream(&bitD4, istart4, length4); - if (HUF_isError(errorCode)) return errorCode; - - /* 16-32 symbols per loop (4-8 symbols per stream) */ - endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4); - for ( ; (endSignal==BIT_DStream_unfinished) && (op4<(oend-7)) ; ) { - HUF_DECODE_SYMBOLX4_2(op1, &bitD1); - HUF_DECODE_SYMBOLX4_2(op2, &bitD2); - HUF_DECODE_SYMBOLX4_2(op3, &bitD3); - HUF_DECODE_SYMBOLX4_2(op4, &bitD4); - HUF_DECODE_SYMBOLX4_1(op1, &bitD1); - HUF_DECODE_SYMBOLX4_1(op2, &bitD2); - HUF_DECODE_SYMBOLX4_1(op3, &bitD3); - HUF_DECODE_SYMBOLX4_1(op4, &bitD4); - HUF_DECODE_SYMBOLX4_2(op1, &bitD1); - HUF_DECODE_SYMBOLX4_2(op2, &bitD2); - HUF_DECODE_SYMBOLX4_2(op3, &bitD3); - HUF_DECODE_SYMBOLX4_2(op4, &bitD4); - HUF_DECODE_SYMBOLX4_0(op1, &bitD1); - HUF_DECODE_SYMBOLX4_0(op2, &bitD2); - HUF_DECODE_SYMBOLX4_0(op3, &bitD3); - HUF_DECODE_SYMBOLX4_0(op4, &bitD4); - - endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4); - } - - /* check corruption */ - if (op1 > opStart2) return ERROR(corruption_detected); - if (op2 > opStart3) return ERROR(corruption_detected); - if (op3 > opStart4) return ERROR(corruption_detected); - /* note : op4 supposed already verified within main loop */ - - /* finish bitStreams one by one */ - HUF_decodeStreamX4(op1, &bitD1, opStart2, dt, dtLog); - HUF_decodeStreamX4(op2, &bitD2, opStart3, dt, dtLog); - HUF_decodeStreamX4(op3, &bitD3, opStart4, dt, dtLog); - HUF_decodeStreamX4(op4, &bitD4, oend, dt, dtLog); - - /* check */ - endSignal = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4); - if (!endSignal) return ERROR(corruption_detected); - - /* decoded size */ - return dstSize; - } -} - - -size_t HUF_decompress4X4 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize) -{ - HUF_CREATE_STATIC_DTABLEX4(DTable, HUF_MAX_TABLELOG); - const BYTE* ip = (const BYTE*) cSrc; - - size_t hSize = HUF_readDTableX4 (DTable, cSrc, cSrcSize); - if (HUF_isError(hSize)) return hSize; - if (hSize >= cSrcSize) return ERROR(srcSize_wrong); - ip += hSize; - cSrcSize -= hSize; - - return HUF_decompress4X4_usingDTable (dst, dstSize, ip, cSrcSize, DTable); -} - - -/* ********************************/ -/* quad-symbol decoding */ -/* ********************************/ -typedef struct { BYTE nbBits; BYTE nbBytes; } HUF_DDescX6; -typedef union { BYTE byte[4]; U32 sequence; } HUF_DSeqX6; - -/* recursive, up to level 3; may benefit from