From 144fdb13c996b89da2b7901e20e252af92854eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Wed, 8 Jul 2020 19:21:39 +0200 Subject: [PATCH 1/8] Update go version to 1.14.4 --- .go-version | 2 +- Makefile | 2 + auditbeat/Dockerfile | 2 +- dev-tools/packaging/packages.yml | 4 +- filebeat/Dockerfile | 2 +- go.mod | 2 +- heartbeat/Dockerfile | 2 +- journalbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- .../module/apache/status/status_test.go | 4 +- .../module/envoyproxy/server/server_test.go | 4 +- metricbeat/module/http/_meta/Dockerfile | 2 +- vendor/modules.txt | 1457 ----------------- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- 17 files changed, 20 insertions(+), 1475 deletions(-) delete mode 100644 vendor/modules.txt diff --git a/.go-version b/.go-version index f3352b3fef91..4e00d0ac0791 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.13.10 +1.14.4 diff --git a/Makefile b/Makefile index 0e21f801f104..11e9c72f72d3 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,8 @@ check: python-env @$(foreach var,$(PROJECTS) dev-tools $(PROJECTS_XPACK_MAGE),$(MAKE) -C $(var) check || exit 1;) @$(FIND) -name *.py -name *.py -not -path "*/build/*" -exec $(PYTHON_ENV)/bin/autopep8 -d --max-line-length 120 {} \; | (! grep . -q) || (echo "Code differs from autopep8's style" && false) @$(FIND) -name *.py -not -path "*/build/*" | xargs $(PYTHON_ENV)/bin/pylint --py3k -E || (echo "Code is not compatible with Python 3" && false) + # check if vendor folder does not exists + [ ! -d vendor ] @# Validate that all updates were committed @$(MAKE) update @$(MAKE) check-headers diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 18a9344addff..194289595e23 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml index d6d9026f0556..a81b683f6e8e 100644 --- a/dev-tools/packaging/packages.yml +++ b/dev-tools/packaging/packages.yml @@ -72,8 +72,8 @@ shared: - &macos_agent_pkg_spec <<: *common extra_vars: - # OS X 10.11 Mountain Lion is the oldest supported by Go 1.13. - # https://golang.org/doc/go1.13#ports + # OS X 10.11 El Capitan is the oldest supported by Go 1.14. + # https://golang.org/doc/go1.14#ports min_supported_osx_version: 10.11 identifier: 'co.{{.BeatVendor | tolower}}.beats.{{.BeatName}}' install_path: /Library/Application Support diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 2800e5b1398b..e4aec49417db 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/go.mod b/go.mod index 44231c67d658..a666752561e6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.13 +go 1.14 require ( 4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index f1f920d0f00e..1ea4bda3cc62 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile index 770849908b8c..b003f0da5c5f 100644 --- a/journalbeat/Dockerfile +++ b/journalbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index 9dcad5b37355..9b89e87b6850 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index f273b6a8face..a4936388f9ef 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 8.0.0 :doc-branch: master -:go-version: 1.13.10 +:go-version: 1.14.4 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 508a6edc915b..e3bd6006dc5a 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt update \ diff --git a/metricbeat/module/apache/status/status_test.go b/metricbeat/module/apache/status/status_test.go index 182b41e1af3c..c7346278c9e4 100644 --- a/metricbeat/module/apache/status/status_test.go +++ b/metricbeat/module/apache/status/status_test.go @@ -178,12 +178,12 @@ func TestFetchTimeout(t *testing.T) { elapsed := time.Since(start) var found bool for _, err := range errs { - if strings.Contains(err.Error(), "request canceled (Client.Timeout exceeded") { + if strings.Contains(err.Error(), "context deadline exceeded (Client.Timeout exceeded") { found = true } } if !found { - assert.Failf(t, "", "expected an error containing 'request canceled (Client.Timeout exceeded'. Got %v", errs) + assert.Failf(t, "", "expected an error containing 'context deadline exceeded (Client.Timeout exceeded'. Got %v", errs) } // Elapsed should be ~50ms, sometimes it can be up to 1s diff --git a/metricbeat/module/envoyproxy/server/server_test.go b/metricbeat/module/envoyproxy/server/server_test.go index c4f8eb775949..df3b00886c90 100644 --- a/metricbeat/module/envoyproxy/server/server_test.go +++ b/metricbeat/module/envoyproxy/server/server_test.go @@ -184,12 +184,12 @@ func TestFetchTimeout(t *testing.T) { elapsed := time.Since(start) var found bool for _, err := range errs { - if strings.Contains(err.Error(), "request canceled (Client.Timeout exceeded") { + if strings.Contains(err.Error(), "context deadline exceeded (Client.Timeout exceeded") { found = true } } if !found { - assert.Failf(t, "", "expected an error containing 'request canceled (Client.Timeout exceeded'. Got %v", errs) + assert.Failf(t, "", "expected an error containing 'context deadline exceeded (Client.Timeout exceeded'. Got %v", errs) } assert.True(t, elapsed < 5*time.Second, "elapsed time: %s", elapsed.String()) diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 973035bd8ef8..5d36c7f7b19a 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 COPY test/main.go main.go diff --git a/vendor/modules.txt b/vendor/modules.txt deleted file mode 100644 index 7ee98f1384e8..000000000000 --- a/vendor/modules.txt +++ /dev/null @@ -1,1457 +0,0 @@ -# 4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f -4d63.com/embedfiles -# 4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b -4d63.com/tz -# cloud.google.com/go v0.51.0 -cloud.google.com/go -cloud.google.com/go/compute/metadata -cloud.google.com/go/functions/metadata -cloud.google.com/go/iam -cloud.google.com/go/internal -cloud.google.com/go/internal/fields -cloud.google.com/go/internal/optional -cloud.google.com/go/internal/trace -cloud.google.com/go/internal/version -cloud.google.com/go/monitoring/apiv3 -# cloud.google.com/go/datastore v1.0.0 -cloud.google.com/go/datastore -cloud.google.com/go/datastore/internal/gaepb -# cloud.google.com/go/pubsub v1.0.1 -cloud.google.com/go/pubsub -cloud.google.com/go/pubsub/apiv1 -cloud.google.com/go/pubsub/internal/distribution -# cloud.google.com/go/storage v1.0.0 -cloud.google.com/go/storage -# code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee -code.cloudfoundry.org/go-diodes -# code.cloudfoundry.org/go-loggregator v7.4.0+incompatible -code.cloudfoundry.org/go-loggregator -code.cloudfoundry.org/go-loggregator/conversion -code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2 -# code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f -code.cloudfoundry.org/gofileutils/fileutils -# code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a -code.cloudfoundry.org/rfc5424 -# github.com/Azure/azure-amqp-common-go/v3 v3.0.0 -github.com/Azure/azure-amqp-common-go/v3 -github.com/Azure/azure-amqp-common-go/v3/aad -github.com/Azure/azure-amqp-common-go/v3/auth -github.com/Azure/azure-amqp-common-go/v3/cbs -github.com/Azure/azure-amqp-common-go/v3/conn -github.com/Azure/azure-amqp-common-go/v3/internal -github.com/Azure/azure-amqp-common-go/v3/internal/tracing -github.com/Azure/azure-amqp-common-go/v3/rpc -github.com/Azure/azure-amqp-common-go/v3/sas -github.com/Azure/azure-amqp-common-go/v3/uuid -# github.com/Azure/azure-event-hubs-go/v3 v3.1.2 -github.com/Azure/azure-event-hubs-go/v3 -github.com/Azure/azure-event-hubs-go/v3/atom -github.com/Azure/azure-event-hubs-go/v3/eph -github.com/Azure/azure-event-hubs-go/v3/persist -github.com/Azure/azure-event-hubs-go/v3/storage -# github.com/Azure/azure-pipeline-go v0.2.1 -github.com/Azure/azure-pipeline-go/pipeline -# github.com/Azure/azure-sdk-for-go v37.1.0+incompatible -github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub -github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights -github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources -github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage -github.com/Azure/azure-sdk-for-go/version -# github.com/Azure/azure-storage-blob-go v0.8.0 -github.com/Azure/azure-storage-blob-go/azblob -# github.com/Azure/go-amqp v0.12.6 -github.com/Azure/go-amqp -github.com/Azure/go-amqp/internal/testconn -# github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 -github.com/Azure/go-ansiterm -github.com/Azure/go-ansiterm/winterm -# github.com/Azure/go-autorest/autorest v0.9.4 -github.com/Azure/go-autorest/autorest -github.com/Azure/go-autorest/autorest/azure -# github.com/Azure/go-autorest/autorest/adal v0.8.1 -github.com/Azure/go-autorest/autorest/adal -# github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 -github.com/Azure/go-autorest/autorest/azure/auth -# github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 -github.com/Azure/go-autorest/autorest/azure/cli -# github.com/Azure/go-autorest/autorest/date v0.2.0 -github.com/Azure/go-autorest/autorest/date -# github.com/Azure/go-autorest/autorest/to v0.3.0 -github.com/Azure/go-autorest/autorest/to -# github.com/Azure/go-autorest/autorest/validation v0.2.0 -github.com/Azure/go-autorest/autorest/validation -# github.com/Azure/go-autorest/logger v0.1.0 -github.com/Azure/go-autorest/logger -# github.com/Azure/go-autorest/tracing v0.5.0 -github.com/Azure/go-autorest/tracing -# github.com/BurntSushi/toml v0.3.1 -github.com/BurntSushi/toml -# github.com/Masterminds/semver v1.4.2 -github.com/Masterminds/semver -# github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 -github.com/Microsoft/go-winio -github.com/Microsoft/go-winio/pkg/guid -# github.com/Microsoft/hcsshim v0.8.7 -github.com/Microsoft/hcsshim/osversion -# github.com/Shopify/sarama v0.0.0-00010101000000-000000000000 => github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e -github.com/Shopify/sarama -# github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6 -github.com/StackExchange/wmi -# github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc -github.com/aerospike/aerospike-client-go -github.com/aerospike/aerospike-client-go/internal/lua -github.com/aerospike/aerospike-client-go/internal/lua/resources -github.com/aerospike/aerospike-client-go/logger -github.com/aerospike/aerospike-client-go/pkg/bcrypt -github.com/aerospike/aerospike-client-go/pkg/ripemd160 -github.com/aerospike/aerospike-client-go/types -github.com/aerospike/aerospike-client-go/types/atomic -github.com/aerospike/aerospike-client-go/types/particle_type -github.com/aerospike/aerospike-client-go/types/rand -github.com/aerospike/aerospike-client-go/utils/buffer -# github.com/akavel/rsrc v0.8.0 -github.com/akavel/rsrc/binutil -github.com/akavel/rsrc/coff -github.com/akavel/rsrc/ico -# github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43 -github.com/andrewkroh/sys/windows/svc/eventlog -# github.com/antlr/antlr4 v0.0.0-20200225173536-225249fdaef5 -github.com/antlr/antlr4/runtime/Go/antlr -# github.com/armon/go-radix v1.0.0 -github.com/armon/go-radix -# github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 -github.com/armon/go-socks5 -# github.com/aws/aws-lambda-go v1.6.0 -github.com/aws/aws-lambda-go/events -github.com/aws/aws-lambda-go/lambda -github.com/aws/aws-lambda-go/lambda/messages -github.com/aws/aws-lambda-go/lambdacontext -# github.com/aws/aws-sdk-go-v2 v0.9.0 -github.com/aws/aws-sdk-go-v2/aws -github.com/aws/aws-sdk-go-v2/aws/arn -github.com/aws/aws-sdk-go-v2/aws/awserr -github.com/aws/aws-sdk-go-v2/aws/defaults -github.com/aws/aws-sdk-go-v2/aws/ec2metadata -github.com/aws/aws-sdk-go-v2/aws/ec2rolecreds -github.com/aws/aws-sdk-go-v2/aws/endpointcreds -github.com/aws/aws-sdk-go-v2/aws/endpoints -github.com/aws/aws-sdk-go-v2/aws/external -github.com/aws/aws-sdk-go-v2/aws/signer/v4 -github.com/aws/aws-sdk-go-v2/aws/stscreds -github.com/aws/aws-sdk-go-v2/internal/awsutil -github.com/aws/aws-sdk-go-v2/internal/ini -github.com/aws/aws-sdk-go-v2/internal/sdk -github.com/aws/aws-sdk-go-v2/private/protocol -github.com/aws/aws-sdk-go-v2/private/protocol/ec2query -github.com/aws/aws-sdk-go-v2/private/protocol/json/jsonutil -github.com/aws/aws-sdk-go-v2/private/protocol/jsonrpc -github.com/aws/aws-sdk-go-v2/private/protocol/query -github.com/aws/aws-sdk-go-v2/private/protocol/query/queryutil -github.com/aws/aws-sdk-go-v2/private/protocol/rest -github.com/aws/aws-sdk-go-v2/private/protocol/restxml -github.com/aws/aws-sdk-go-v2/private/protocol/xml -github.com/aws/aws-sdk-go-v2/private/protocol/xml/xmlutil -github.com/aws/aws-sdk-go-v2/service/cloudformation -github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface -github.com/aws/aws-sdk-go-v2/service/cloudwatch -github.com/aws/aws-sdk-go-v2/service/cloudwatch/cloudwatchiface -github.com/aws/aws-sdk-go-v2/service/ec2 -github.com/aws/aws-sdk-go-v2/service/ec2/ec2iface -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/elasticloadbalancingv2iface -github.com/aws/aws-sdk-go-v2/service/iam -github.com/aws/aws-sdk-go-v2/service/rds -github.com/aws/aws-sdk-go-v2/service/rds/rdsiface -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface -github.com/aws/aws-sdk-go-v2/service/s3 -github.com/aws/aws-sdk-go-v2/service/s3/s3iface -github.com/aws/aws-sdk-go-v2/service/sqs -github.com/aws/aws-sdk-go-v2/service/sqs/sqsiface -github.com/aws/aws-sdk-go-v2/service/sts -# github.com/awslabs/goformation/v4 v4.1.0 -github.com/awslabs/goformation/v4/cloudformation -github.com/awslabs/goformation/v4/cloudformation/accessanalyzer -github.com/awslabs/goformation/v4/cloudformation/amazonmq -github.com/awslabs/goformation/v4/cloudformation/amplify -github.com/awslabs/goformation/v4/cloudformation/apigateway -github.com/awslabs/goformation/v4/cloudformation/apigatewayv2 -github.com/awslabs/goformation/v4/cloudformation/applicationautoscaling -github.com/awslabs/goformation/v4/cloudformation/appmesh -github.com/awslabs/goformation/v4/cloudformation/appstream -github.com/awslabs/goformation/v4/cloudformation/appsync -github.com/awslabs/goformation/v4/cloudformation/ask -github.com/awslabs/goformation/v4/cloudformation/athena -github.com/awslabs/goformation/v4/cloudformation/autoscaling -github.com/awslabs/goformation/v4/cloudformation/autoscalingplans -github.com/awslabs/goformation/v4/cloudformation/backup -github.com/awslabs/goformation/v4/cloudformation/batch -github.com/awslabs/goformation/v4/cloudformation/budgets -github.com/awslabs/goformation/v4/cloudformation/certificatemanager -github.com/awslabs/goformation/v4/cloudformation/cloud9 -github.com/awslabs/goformation/v4/cloudformation/cloudformation -github.com/awslabs/goformation/v4/cloudformation/cloudfront -github.com/awslabs/goformation/v4/cloudformation/cloudtrail -github.com/awslabs/goformation/v4/cloudformation/cloudwatch -github.com/awslabs/goformation/v4/cloudformation/codebuild -github.com/awslabs/goformation/v4/cloudformation/codecommit -github.com/awslabs/goformation/v4/cloudformation/codedeploy -github.com/awslabs/goformation/v4/cloudformation/codepipeline -github.com/awslabs/goformation/v4/cloudformation/codestar -github.com/awslabs/goformation/v4/cloudformation/codestarnotifications -github.com/awslabs/goformation/v4/cloudformation/cognito -github.com/awslabs/goformation/v4/cloudformation/config -github.com/awslabs/goformation/v4/cloudformation/datapipeline -github.com/awslabs/goformation/v4/cloudformation/dax -github.com/awslabs/goformation/v4/cloudformation/directoryservice -github.com/awslabs/goformation/v4/cloudformation/dlm -github.com/awslabs/goformation/v4/cloudformation/dms -github.com/awslabs/goformation/v4/cloudformation/docdb -github.com/awslabs/goformation/v4/cloudformation/dynamodb -github.com/awslabs/goformation/v4/cloudformation/ec2 -github.com/awslabs/goformation/v4/cloudformation/ecr -github.com/awslabs/goformation/v4/cloudformation/ecs -github.com/awslabs/goformation/v4/cloudformation/efs -github.com/awslabs/goformation/v4/cloudformation/eks -github.com/awslabs/goformation/v4/cloudformation/elasticache -github.com/awslabs/goformation/v4/cloudformation/elasticbeanstalk -github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancing -github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2 -github.com/awslabs/goformation/v4/cloudformation/elasticsearch -github.com/awslabs/goformation/v4/cloudformation/emr -github.com/awslabs/goformation/v4/cloudformation/events -github.com/awslabs/goformation/v4/cloudformation/eventschemas -github.com/awslabs/goformation/v4/cloudformation/fsx -github.com/awslabs/goformation/v4/cloudformation/gamelift -github.com/awslabs/goformation/v4/cloudformation/glue -github.com/awslabs/goformation/v4/cloudformation/greengrass -github.com/awslabs/goformation/v4/cloudformation/guardduty -github.com/awslabs/goformation/v4/cloudformation/iam -github.com/awslabs/goformation/v4/cloudformation/inspector -github.com/awslabs/goformation/v4/cloudformation/iot -github.com/awslabs/goformation/v4/cloudformation/iot1click -github.com/awslabs/goformation/v4/cloudformation/iotanalytics -github.com/awslabs/goformation/v4/cloudformation/iotevents -github.com/awslabs/goformation/v4/cloudformation/iotthingsgraph -github.com/awslabs/goformation/v4/cloudformation/kinesis -github.com/awslabs/goformation/v4/cloudformation/kinesisanalytics -github.com/awslabs/goformation/v4/cloudformation/kinesisanalyticsv2 -github.com/awslabs/goformation/v4/cloudformation/kinesisfirehose -github.com/awslabs/goformation/v4/cloudformation/kms -github.com/awslabs/goformation/v4/cloudformation/lakeformation -github.com/awslabs/goformation/v4/cloudformation/lambda -github.com/awslabs/goformation/v4/cloudformation/logs -github.com/awslabs/goformation/v4/cloudformation/managedblockchain -github.com/awslabs/goformation/v4/cloudformation/mediaconvert -github.com/awslabs/goformation/v4/cloudformation/medialive -github.com/awslabs/goformation/v4/cloudformation/mediastore -github.com/awslabs/goformation/v4/cloudformation/msk -github.com/awslabs/goformation/v4/cloudformation/neptune -github.com/awslabs/goformation/v4/cloudformation/opsworks -github.com/awslabs/goformation/v4/cloudformation/opsworkscm -github.com/awslabs/goformation/v4/cloudformation/pinpoint -github.com/awslabs/goformation/v4/cloudformation/pinpointemail -github.com/awslabs/goformation/v4/cloudformation/policies -github.com/awslabs/goformation/v4/cloudformation/qldb -github.com/awslabs/goformation/v4/cloudformation/ram -github.com/awslabs/goformation/v4/cloudformation/rds -github.com/awslabs/goformation/v4/cloudformation/redshift -github.com/awslabs/goformation/v4/cloudformation/robomaker -github.com/awslabs/goformation/v4/cloudformation/route53 -github.com/awslabs/goformation/v4/cloudformation/route53resolver -github.com/awslabs/goformation/v4/cloudformation/s3 -github.com/awslabs/goformation/v4/cloudformation/sagemaker -github.com/awslabs/goformation/v4/cloudformation/sdb -github.com/awslabs/goformation/v4/cloudformation/secretsmanager -github.com/awslabs/goformation/v4/cloudformation/securityhub -github.com/awslabs/goformation/v4/cloudformation/serverless -github.com/awslabs/goformation/v4/cloudformation/servicecatalog -github.com/awslabs/goformation/v4/cloudformation/servicediscovery -github.com/awslabs/goformation/v4/cloudformation/ses -github.com/awslabs/goformation/v4/cloudformation/sns -github.com/awslabs/goformation/v4/cloudformation/sqs -github.com/awslabs/goformation/v4/cloudformation/ssm -github.com/awslabs/goformation/v4/cloudformation/stepfunctions -github.com/awslabs/goformation/v4/cloudformation/tags -github.com/awslabs/goformation/v4/cloudformation/transfer -github.com/awslabs/goformation/v4/cloudformation/utils -github.com/awslabs/goformation/v4/cloudformation/waf -github.com/awslabs/goformation/v4/cloudformation/wafregional -github.com/awslabs/goformation/v4/cloudformation/wafv2 -github.com/awslabs/goformation/v4/cloudformation/workspaces -github.com/awslabs/goformation/v4/intrinsics -# github.com/beorn7/perks v1.0.1 -github.com/beorn7/perks/quantile -# github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 -github.com/blakesmith/ar -# github.com/bradleyfalzon/ghinstallation v1.1.0 -github.com/bradleyfalzon/ghinstallation -# github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible -github.com/bsm/sarama-cluster -# github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e -github.com/cavaliercoder/go-rpm -github.com/cavaliercoder/go-rpm/version -# github.com/cespare/xxhash/v2 v2.1.1 -github.com/cespare/xxhash/v2 -# github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f -github.com/cloudfoundry-community/go-cfclient -# github.com/cloudfoundry/noaa v2.1.0+incompatible -github.com/cloudfoundry/noaa -github.com/cloudfoundry/noaa/consumer -github.com/cloudfoundry/noaa/consumer/internal -github.com/cloudfoundry/noaa/errors -# github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 -github.com/cloudfoundry/sonde-go/events -# github.com/containerd/containerd v1.3.3 -github.com/containerd/containerd/errdefs -# github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 -github.com/containerd/continuity/fs -github.com/containerd/continuity/pathdriver -github.com/containerd/continuity/syscallx -github.com/containerd/continuity/sysx -# github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c -github.com/containerd/fifo -# github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98 -github.com/coreos/bbolt -# github.com/coreos/go-systemd/v22 v22.0.0 -github.com/coreos/go-systemd/v22/activation -github.com/coreos/go-systemd/v22/dbus -github.com/coreos/go-systemd/v22/internal/dlopen -github.com/coreos/go-systemd/v22/sdjournal -# github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea -github.com/coreos/pkg/dlopen -# github.com/davecgh/go-spew v1.1.1 -github.com/davecgh/go-spew/spew -# github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 -github.com/davecgh/go-xdr/xdr2 -# github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e -github.com/denisenkom/go-mssqldb -github.com/denisenkom/go-mssqldb/internal/cp -github.com/denisenkom/go-mssqldb/internal/decimal -github.com/denisenkom/go-mssqldb/internal/querytext -# github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 -github.com/devigned/tab -# github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible -github.com/dgrijalva/jwt-go -# github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1 -github.com/digitalocean/go-libvirt -github.com/digitalocean/go-libvirt/internal/constants -github.com/digitalocean/go-libvirt/libvirttest -# github.com/dimchansky/utfbom v1.1.0 -github.com/dimchansky/utfbom -# github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf -github.com/dlclark/regexp2 -github.com/dlclark/regexp2/syntax -# github.com/docker/distribution v2.7.1+incompatible -github.com/docker/distribution/digestset -github.com/docker/distribution/reference -github.com/docker/distribution/registry/api/errcode -# github.com/docker/docker v1.4.2-0.20170802015333-8af4db6f002a => github.com/docker/engine v0.0.0-20191113042239-ea84732a7725 -github.com/docker/docker/api -github.com/docker/docker/api/types -github.com/docker/docker/api/types/backend -github.com/docker/docker/api/types/blkiodev -github.com/docker/docker/api/types/container -github.com/docker/docker/api/types/events -github.com/docker/docker/api/types/filters -github.com/docker/docker/api/types/image -github.com/docker/docker/api/types/mount -github.com/docker/docker/api/types/network -github.com/docker/docker/api/types/plugins/logdriver -github.com/docker/docker/api/types/registry -github.com/docker/docker/api/types/strslice -github.com/docker/docker/api/types/swarm -github.com/docker/docker/api/types/swarm/runtime -github.com/docker/docker/api/types/time -github.com/docker/docker/api/types/versions -github.com/docker/docker/api/types/volume -github.com/docker/docker/client -github.com/docker/docker/daemon/logger -github.com/docker/docker/errdefs -github.com/docker/docker/pkg/archive -github.com/docker/docker/pkg/fileutils -github.com/docker/docker/pkg/idtools -github.com/docker/docker/pkg/ioutils -github.com/docker/docker/pkg/jsonmessage -github.com/docker/docker/pkg/longpath -github.com/docker/docker/pkg/mount -github.com/docker/docker/pkg/plugingetter -github.com/docker/docker/pkg/plugins -github.com/docker/docker/pkg/plugins/transport -github.com/docker/docker/pkg/pools -github.com/docker/docker/pkg/progress -github.com/docker/docker/pkg/streamformatter -github.com/docker/docker/pkg/stringid -github.com/docker/docker/pkg/system -github.com/docker/docker/pkg/term -github.com/docker/docker/pkg/term/windows -# github.com/docker/go-connections v0.4.0 -github.com/docker/go-connections/nat -github.com/docker/go-connections/sockets -github.com/docker/go-connections/tlsconfig -# github.com/docker/go-metrics v0.0.1 -github.com/docker/go-metrics -# github.com/docker/go-plugins-helpers v0.0.0-20181025120712-1e6269c305b8 => github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f -github.com/docker/go-plugins-helpers/sdk -# github.com/docker/go-units v0.4.0 -github.com/docker/go-units -# github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 -github.com/docker/spdystream -github.com/docker/spdystream/spdy -# github.com/dop251/goja v0.0.0-00010101000000-000000000000 => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 -github.com/dop251/goja -github.com/dop251/goja/ast -github.com/dop251/goja/file -github.com/dop251/goja/parser -github.com/dop251/goja/token -# github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 -github.com/dop251/goja_nodejs/require -github.com/dop251/goja_nodejs/util -# github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 -github.com/dustin/go-humanize -# github.com/eapache/go-resiliency v1.2.0 -github.com/eapache/go-resiliency/breaker -# github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 -github.com/eapache/go-xerial-snappy -# github.com/eapache/queue v1.1.0 -github.com/eapache/queue -# github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 -github.com/eclipse/paho.mqtt.golang -github.com/eclipse/paho.mqtt.golang/packets -# github.com/elastic/ecs v1.5.0 -github.com/elastic/ecs/code/go/ecs -# github.com/elastic/elastic-agent-client/v7 v7.0.0-20200601155656-d6a9eb4f6d07 -github.com/elastic/elastic-agent-client/v7/pkg/client -github.com/elastic/elastic-agent-client/v7/pkg/proto -github.com/elastic/elastic-agent-client/v7/pkg/utils -# github.com/elastic/go-concert v0.0.2 -github.com/elastic/go-concert -github.com/elastic/go-concert/atomic -github.com/elastic/go-concert/chorus -github.com/elastic/go-concert/unison -# github.com/elastic/go-libaudit/v2 v2.0.0-20200515221334-92371bef3fb8 -github.com/elastic/go-libaudit/v2 -github.com/elastic/go-libaudit/v2/aucoalesce -github.com/elastic/go-libaudit/v2/auparse -github.com/elastic/go-libaudit/v2/rule -github.com/elastic/go-libaudit/v2/rule/flags -github.com/elastic/go-libaudit/v2/sys -# github.com/elastic/go-licenser v0.2.1 -github.com/elastic/go-licenser -github.com/elastic/go-licenser/licensing -# github.com/elastic/go-lookslike v0.3.0 -github.com/elastic/go-lookslike -github.com/elastic/go-lookslike/internal/llreflect -github.com/elastic/go-lookslike/isdef -github.com/elastic/go-lookslike/llpath -github.com/elastic/go-lookslike/llresult -github.com/elastic/go-lookslike/testslike -github.com/elastic/go-lookslike/validator -# github.com/elastic/go-lumber v0.1.0 -github.com/elastic/go-lumber/client/v2 -github.com/elastic/go-lumber/lj -github.com/elastic/go-lumber/log -github.com/elastic/go-lumber/protocol/v2 -github.com/elastic/go-lumber/server/internal -github.com/elastic/go-lumber/server/v2 -# github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 -github.com/elastic/go-perf -# github.com/elastic/go-seccomp-bpf v1.1.0 -github.com/elastic/go-seccomp-bpf -github.com/elastic/go-seccomp-bpf/arch -# github.com/elastic/go-structform v0.0.7 -github.com/elastic/go-structform -github.com/elastic/go-structform/cborl -github.com/elastic/go-structform/gotype -github.com/elastic/go-structform/internal/unsafe -github.com/elastic/go-structform/json -github.com/elastic/go-structform/ubjson -github.com/elastic/go-structform/visitors -# github.com/elastic/go-sysinfo v1.3.0 -github.com/elastic/go-sysinfo -github.com/elastic/go-sysinfo/internal/registry -github.com/elastic/go-sysinfo/providers/darwin -github.com/elastic/go-sysinfo/providers/linux -github.com/elastic/go-sysinfo/providers/shared -github.com/elastic/go-sysinfo/providers/windows -github.com/elastic/go-sysinfo/types -# github.com/elastic/go-txfile v0.0.7 -github.com/elastic/go-txfile -github.com/elastic/go-txfile/dev-tools/lib/mage/xbuild -github.com/elastic/go-txfile/internal/cleanup -github.com/elastic/go-txfile/internal/invariant -github.com/elastic/go-txfile/internal/iter -github.com/elastic/go-txfile/internal/strbld -github.com/elastic/go-txfile/internal/tracelog -github.com/elastic/go-txfile/internal/vfs -github.com/elastic/go-txfile/internal/vfs/osfs -github.com/elastic/go-txfile/internal/vfs/osfs/osfstest -github.com/elastic/go-txfile/pq -github.com/elastic/go-txfile/txerr -github.com/elastic/go-txfile/txfiletest -# github.com/elastic/go-ucfg v0.8.3 -github.com/elastic/go-ucfg -github.com/elastic/go-ucfg/cfgutil -github.com/elastic/go-ucfg/flag -github.com/elastic/go-ucfg/json -github.com/elastic/go-ucfg/parse -github.com/elastic/go-ucfg/yaml -# github.com/elastic/go-windows v1.0.1 -github.com/elastic/go-windows -# github.com/elastic/gosigar v0.10.5 -github.com/elastic/gosigar -github.com/elastic/gosigar/cgroup -github.com/elastic/gosigar/sys -github.com/elastic/gosigar/sys/linux -github.com/elastic/gosigar/sys/windows -# github.com/evanphx/json-patch v4.2.0+incompatible -github.com/evanphx/json-patch -# github.com/fatih/color v1.5.0 -github.com/fatih/color -# github.com/fsnotify/fsevents v0.0.0-00010101000000-000000000000 => github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 -github.com/fsnotify/fsevents -# github.com/fsnotify/fsnotify v1.4.7 => github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d -github.com/fsnotify/fsnotify -# github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24 -github.com/garyburd/redigo/internal -github.com/garyburd/redigo/redis -# github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647 -github.com/go-ole/go-ole -github.com/go-ole/go-ole/oleutil -# github.com/go-sourcemap/sourcemap v2.1.2+incompatible -github.com/go-sourcemap/sourcemap -github.com/go-sourcemap/sourcemap/internal/base64vlq -# github.com/go-sql-driver/mysql v1.4.1 -github.com/go-sql-driver/mysql -# github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be -github.com/gocarina/gocsv -# github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e -github.com/godbus/dbus -# github.com/godbus/dbus/v5 v5.0.3 -github.com/godbus/dbus/v5 -# github.com/godror/godror v0.10.4 -github.com/godror/godror -# github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b -github.com/gofrs/flock -# github.com/gofrs/uuid v3.3.0+incompatible -github.com/gofrs/uuid -# github.com/gogo/protobuf v1.3.1 -github.com/gogo/protobuf/gogoproto -github.com/gogo/protobuf/proto -github.com/gogo/protobuf/protoc-gen-gogo/descriptor -github.com/gogo/protobuf/sortkeys -github.com/gogo/protobuf/types -# github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe -github.com/golang-sql/civil -# github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 -github.com/golang/groupcache/lru -# github.com/golang/protobuf v1.4.2 -github.com/golang/protobuf/descriptor -github.com/golang/protobuf/internal/gengogrpc -github.com/golang/protobuf/jsonpb -github.com/golang/protobuf/proto -github.com/golang/protobuf/protoc-gen-go -github.com/golang/protobuf/protoc-gen-go/descriptor -github.com/golang/protobuf/ptypes -github.com/golang/protobuf/ptypes/any -github.com/golang/protobuf/ptypes/duration -github.com/golang/protobuf/ptypes/empty -github.com/golang/protobuf/ptypes/struct -github.com/golang/protobuf/ptypes/timestamp -github.com/golang/protobuf/ptypes/wrappers -# github.com/golang/snappy v0.0.1 -github.com/golang/snappy -# github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9 -github.com/google/flatbuffers/go -# github.com/google/go-cmp v0.4.0 -github.com/google/go-cmp/cmp -github.com/google/go-cmp/cmp/internal/diff -github.com/google/go-cmp/cmp/internal/flags -github.com/google/go-cmp/cmp/internal/function -github.com/google/go-cmp/cmp/internal/value -# github.com/google/go-github/v28 v28.1.1 -github.com/google/go-github/v28/github -# github.com/google/go-github/v29 v29.0.2 -github.com/google/go-github/v29/github -# github.com/google/go-querystring v1.0.0 -github.com/google/go-querystring/query -# github.com/google/gofuzz v1.1.0 -github.com/google/gofuzz -# github.com/google/gopacket v1.1.18-0.20191009163724-0ad7f2610e34 => github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41 -github.com/google/gopacket -github.com/google/gopacket/afpacket -github.com/google/gopacket/layers -# github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f -github.com/google/uuid -# github.com/googleapis/gax-go/v2 v2.0.5 -github.com/googleapis/gax-go/v2 -# github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985 -github.com/googleapis/gnostic/OpenAPIv2 -github.com/googleapis/gnostic/compiler -github.com/googleapis/gnostic/extensions -# github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a -github.com/gorhill/cronexpr -# github.com/gorilla/websocket v1.4.1 -github.com/gorilla/websocket -# github.com/grpc-ecosystem/grpc-gateway v1.13.0 -github.com/grpc-ecosystem/grpc-gateway/internal -github.com/grpc-ecosystem/grpc-gateway/runtime -github.com/grpc-ecosystem/grpc-gateway/utilities -# github.com/h2non/filetype v1.0.12 -github.com/h2non/filetype -github.com/h2non/filetype/matchers -github.com/h2non/filetype/matchers/isobmff -github.com/h2non/filetype/types -# github.com/hashicorp/errwrap v1.0.0 -github.com/hashicorp/errwrap -# github.com/hashicorp/go-cleanhttp v0.5.1 -github.com/hashicorp/go-cleanhttp -# github.com/hashicorp/go-multierror v1.1.0 -github.com/hashicorp/go-multierror -# github.com/hashicorp/go-retryablehttp v0.6.6 -github.com/hashicorp/go-retryablehttp -# github.com/hashicorp/go-uuid v1.0.2 -github.com/hashicorp/go-uuid -# github.com/hashicorp/go-version v1.0.0 -github.com/hashicorp/go-version -# github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d -github.com/hashicorp/golang-lru -github.com/hashicorp/golang-lru/simplelru -# github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01 -github.com/haya14busa/go-actions-toolkit/core -# github.com/imdario/mergo v0.3.6 -github.com/imdario/mergo -# github.com/inconshreveable/mousetrap v1.0.0 -github.com/inconshreveable/mousetrap -# github.com/insomniacslk/dhcp v0.0.0-20180716145214-633285ba52b2 => github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 -github.com/insomniacslk/dhcp/dhcpv4 -github.com/insomniacslk/dhcp/iana -# github.com/jcmturner/gofork v1.0.0 -github.com/jcmturner/gofork/encoding/asn1 -github.com/jcmturner/gofork/x/crypto/pbkdf2 -# github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af -github.com/jmespath/go-jmespath -# github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 -github.com/jmoiron/sqlx -github.com/jmoiron/sqlx/reflectx -# github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 -github.com/joeshaw/multierror -# github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd -github.com/josephspurrier/goversioninfo -# github.com/jpillora/backoff v1.0.0 -github.com/jpillora/backoff -# github.com/json-iterator/go v1.1.8 -github.com/json-iterator/go -# github.com/jstemmer/go-junit-report v0.9.1 -github.com/jstemmer/go-junit-report -github.com/jstemmer/go-junit-report/formatter -github.com/jstemmer/go-junit-report/parser -# github.com/klauspost/compress v1.9.8 -github.com/klauspost/compress/flate -github.com/klauspost/compress/fse -github.com/klauspost/compress/huff0 -github.com/klauspost/compress/snappy -github.com/klauspost/compress/zlib -github.com/klauspost/compress/zstd -github.com/klauspost/compress/zstd/internal/xxhash -# github.com/konsorten/go-windows-terminal-sequences v1.0.2 -github.com/konsorten/go-windows-terminal-sequences -# github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01 -github.com/lib/pq -github.com/lib/pq/oid -github.com/lib/pq/scram -# github.com/magefile/mage v1.9.0 -github.com/magefile/mage -github.com/magefile/mage/internal -github.com/magefile/mage/mage -github.com/magefile/mage/mg -github.com/magefile/mage/parse -github.com/magefile/mage/sh -github.com/magefile/mage/target -# github.com/mailru/easyjson v0.7.1 -github.com/mailru/easyjson -github.com/mailru/easyjson/buffer -github.com/mailru/easyjson/jlexer -github.com/mailru/easyjson/jwriter -# github.com/mattn/go-colorable v0.0.8 -github.com/mattn/go-colorable -# github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe -github.com/mattn/go-ieproxy -# github.com/mattn/go-isatty v0.0.2 -github.com/mattn/go-isatty -# github.com/mattn/go-shellwords v1.0.7 -github.com/mattn/go-shellwords -# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 -github.com/matttproud/golang_protobuf_extensions/pbutil -# github.com/miekg/dns v1.1.15 -github.com/miekg/dns -# github.com/mitchellh/go-homedir v1.1.0 -github.com/mitchellh/go-homedir -# github.com/mitchellh/gox v1.0.1 -github.com/mitchellh/gox -# github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51 -github.com/mitchellh/hashstructure -# github.com/mitchellh/iochan v1.0.0 -github.com/mitchellh/iochan -# github.com/mitchellh/mapstructure v1.1.2 -github.com/mitchellh/mapstructure -# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd -github.com/modern-go/concurrent -# github.com/modern-go/reflect2 v1.0.1 -github.com/modern-go/reflect2 -# github.com/morikuni/aec v1.0.0 -github.com/morikuni/aec -# github.com/oklog/ulid v1.3.1 -github.com/oklog/ulid -# github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483 -github.com/opencontainers/go-digest -# github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 -github.com/opencontainers/image-spec/specs-go -github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.0.0-rc9 -github.com/opencontainers/runc/libcontainer/system -github.com/opencontainers/runc/libcontainer/user -# github.com/pierrec/lz4 v2.4.1+incompatible -github.com/pierrec/lz4 -github.com/pierrec/lz4/internal/xxh32 -# github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338 -github.com/pierrre/gotestcover -# github.com/pkg/errors v0.9.1 -github.com/pkg/errors -# github.com/pmezard/go-difflib v1.0.0 -github.com/pmezard/go-difflib/difflib -# github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc -github.com/prometheus/client_golang/prometheus -github.com/prometheus/client_golang/prometheus/internal -github.com/prometheus/client_golang/prometheus/promhttp -# github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 -github.com/prometheus/client_model/go -# github.com/prometheus/common v0.7.0 -github.com/prometheus/common/expfmt -github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg -github.com/prometheus/common/model -# github.com/prometheus/procfs v0.0.11 -github.com/prometheus/procfs -github.com/prometheus/procfs/internal/fs -github.com/prometheus/procfs/internal/util -# github.com/prometheus/prometheus v2.5.0+incompatible -github.com/prometheus/prometheus/prompb -# github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 -github.com/rcrowley/go-metrics -# github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd -github.com/reviewdog/errorformat -github.com/reviewdog/errorformat/fmts -# github.com/reviewdog/reviewdog v0.9.17 -github.com/reviewdog/reviewdog -github.com/reviewdog/reviewdog/cienv -github.com/reviewdog/reviewdog/cmd/reviewdog -github.com/reviewdog/reviewdog/commands -github.com/reviewdog/reviewdog/diff -github.com/reviewdog/reviewdog/doghouse -github.com/reviewdog/reviewdog/doghouse/client -github.com/reviewdog/reviewdog/doghouse/server -github.com/reviewdog/reviewdog/doghouse/server/storage -github.com/reviewdog/reviewdog/project -github.com/reviewdog/reviewdog/service/github -github.com/reviewdog/reviewdog/service/github/githubutils -github.com/reviewdog/reviewdog/service/gitlab -github.com/reviewdog/reviewdog/service/serviceutil -# github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e -github.com/samuel/go-parser/parser -# github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54 -github.com/samuel/go-thrift/parser -# github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b -github.com/sanathkr/go-yaml -# github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 -github.com/sanathkr/yaml -# github.com/santhosh-tekuri/jsonschema v1.2.4 -github.com/santhosh-tekuri/jsonschema -github.com/santhosh-tekuri/jsonschema/decoders -github.com/santhosh-tekuri/jsonschema/formats -github.com/santhosh-tekuri/jsonschema/loader -github.com/santhosh-tekuri/jsonschema/mediatypes -# github.com/shirou/gopsutil v2.19.11+incompatible -github.com/shirou/gopsutil/disk -github.com/shirou/gopsutil/internal/common -github.com/shirou/gopsutil/net -# github.com/sirupsen/logrus v1.4.2 -github.com/sirupsen/logrus -# github.com/spf13/cobra v0.0.3 -github.com/spf13/cobra -# github.com/spf13/pflag v1.0.5 -github.com/spf13/pflag -# github.com/stretchr/objx v0.2.0 -github.com/stretchr/objx -# github.com/stretchr/testify v1.5.1 -github.com/stretchr/testify/assert -github.com/stretchr/testify/mock -github.com/stretchr/testify/require -github.com/stretchr/testify/suite -# github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b -github.com/tsg/go-daemon -# github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a -github.com/tsg/gopacket -github.com/tsg/gopacket/afpacket -github.com/tsg/gopacket/layers -github.com/tsg/gopacket/pcap -# github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 -github.com/urso/diag -github.com/urso/diag/ctxfmt -# github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e -github.com/urso/go-bin -# github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a -github.com/urso/magetools/clitool -github.com/urso/magetools/ctrl -github.com/urso/magetools/fs -github.com/urso/magetools/gotool -github.com/urso/magetools/mgenv -# github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec -github.com/urso/sderr -# github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41 -github.com/vmware/govmomi -github.com/vmware/govmomi/find -github.com/vmware/govmomi/list -github.com/vmware/govmomi/nfc -github.com/vmware/govmomi/object -github.com/vmware/govmomi/property -github.com/vmware/govmomi/session -github.com/vmware/govmomi/simulator -github.com/vmware/govmomi/simulator/esx -github.com/vmware/govmomi/simulator/vpx -github.com/vmware/govmomi/task -github.com/vmware/govmomi/view -github.com/vmware/govmomi/vim25 -github.com/vmware/govmomi/vim25/debug -github.com/vmware/govmomi/vim25/methods -github.com/vmware/govmomi/vim25/mo -github.com/vmware/govmomi/vim25/progress -github.com/vmware/govmomi/vim25/soap -github.com/vmware/govmomi/vim25/types -github.com/vmware/govmomi/vim25/xml -# github.com/xanzy/go-gitlab v0.22.3 -github.com/xanzy/go-gitlab -# github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c -github.com/xdg/scram -# github.com/xdg/stringprep v1.0.0 -github.com/xdg/stringprep -# github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7 -github.com/yuin/gopher-lua -github.com/yuin/gopher-lua/ast -github.com/yuin/gopher-lua/parse -github.com/yuin/gopher-lua/pm -# go.elastic.co/apm v1.7.2 -go.elastic.co/apm -go.elastic.co/apm/apmconfig -go.elastic.co/apm/apmtest -go.elastic.co/apm/internal/apmcontext -go.elastic.co/apm/internal/apmhostutil -go.elastic.co/apm/internal/apmhttputil -go.elastic.co/apm/internal/apmlog -go.elastic.co/apm/internal/apmschema -go.elastic.co/apm/internal/apmstrings -go.elastic.co/apm/internal/apmversion -go.elastic.co/apm/internal/configutil -go.elastic.co/apm/internal/iochan -go.elastic.co/apm/internal/pkgerrorsutil -go.elastic.co/apm/internal/ringbuffer -go.elastic.co/apm/internal/wildcard -go.elastic.co/apm/model -go.elastic.co/apm/stacktrace -go.elastic.co/apm/transport -go.elastic.co/apm/transport/transporttest -# go.elastic.co/apm/module/apmelasticsearch v1.7.2 -go.elastic.co/apm/module/apmelasticsearch -# go.elastic.co/apm/module/apmhttp v1.7.2 -go.elastic.co/apm/module/apmhttp -# go.elastic.co/ecszap v0.2.0 -go.elastic.co/ecszap -go.elastic.co/ecszap/internal -# go.elastic.co/fastjson v1.0.0 -go.elastic.co/fastjson -# go.opencensus.io v0.22.2 -go.opencensus.io -go.opencensus.io/internal -go.opencensus.io/internal/tagencoding -go.opencensus.io/metric/metricdata -go.opencensus.io/metric/metricproducer -go.opencensus.io/plugin/ocgrpc -go.opencensus.io/plugin/ochttp -go.opencensus.io/plugin/ochttp/propagation/b3 -go.opencensus.io/resource -go.opencensus.io/stats -go.opencensus.io/stats/internal -go.opencensus.io/stats/view -go.opencensus.io/tag -go.opencensus.io/trace -go.opencensus.io/trace/internal -go.opencensus.io/trace/propagation -go.opencensus.io/trace/tracestate -# go.uber.org/atomic v1.5.0 -go.uber.org/atomic -# go.uber.org/multierr v1.3.0 -go.uber.org/multierr -# go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee -go.uber.org/tools/update-license -# go.uber.org/zap v1.14.0 -go.uber.org/zap -go.uber.org/zap/buffer -go.uber.org/zap/internal/bufferpool -go.uber.org/zap/internal/color -go.uber.org/zap/internal/exit -go.uber.org/zap/zapcore -go.uber.org/zap/zaptest/observer -# golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 -golang.org/x/crypto/blake2b -golang.org/x/crypto/blowfish -golang.org/x/crypto/cast5 -golang.org/x/crypto/chacha20 -golang.org/x/crypto/curve25519 -golang.org/x/crypto/ed25519 -golang.org/x/crypto/ed25519/internal/edwards25519 -golang.org/x/crypto/internal/subtle -golang.org/x/crypto/md4 -golang.org/x/crypto/openpgp -golang.org/x/crypto/openpgp/armor -golang.org/x/crypto/openpgp/elgamal -golang.org/x/crypto/openpgp/errors -golang.org/x/crypto/openpgp/packet -golang.org/x/crypto/openpgp/s2k -golang.org/x/crypto/pbkdf2 -golang.org/x/crypto/pkcs12 -golang.org/x/crypto/pkcs12/internal/rc2 -golang.org/x/crypto/poly1305 -golang.org/x/crypto/sha3 -golang.org/x/crypto/ssh -golang.org/x/crypto/ssh/internal/bcrypt_pbkdf -golang.org/x/crypto/ssh/terminal -# golang.org/x/exp v0.0.0-20191227195350-da58074b4299 -golang.org/x/exp/apidiff -golang.org/x/exp/cmd/apidiff -# golang.org/x/lint v0.0.0-20200130185559-910be7a94367 -golang.org/x/lint -golang.org/x/lint/golint -# golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee -golang.org/x/mod/module -golang.org/x/mod/semver -# golang.org/x/net v0.0.0-20200202094626-16171245cfb2 -golang.org/x/net/bpf -golang.org/x/net/context -golang.org/x/net/context/ctxhttp -golang.org/x/net/http/httpguts -golang.org/x/net/http/httpproxy -golang.org/x/net/http2 -golang.org/x/net/http2/hpack -golang.org/x/net/icmp -golang.org/x/net/idna -golang.org/x/net/internal/iana -golang.org/x/net/internal/socket -golang.org/x/net/internal/socks -golang.org/x/net/internal/timeseries -golang.org/x/net/ipv4 -golang.org/x/net/ipv6 -golang.org/x/net/netutil -golang.org/x/net/proxy -golang.org/x/net/publicsuffix -golang.org/x/net/trace -golang.org/x/net/websocket -# golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d -golang.org/x/oauth2 -golang.org/x/oauth2/clientcredentials -golang.org/x/oauth2/endpoints -golang.org/x/oauth2/google -golang.org/x/oauth2/internal -golang.org/x/oauth2/jws -golang.org/x/oauth2/jwt -# golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e -golang.org/x/sync/errgroup -golang.org/x/sync/semaphore -# golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e -golang.org/x/sys/cpu -golang.org/x/sys/unix -golang.org/x/sys/windows -golang.org/x/sys/windows/registry -golang.org/x/sys/windows/svc -golang.org/x/sys/windows/svc/debug -golang.org/x/sys/windows/svc/eventlog -# golang.org/x/text v0.3.2 -golang.org/x/text/cases -golang.org/x/text/collate -golang.org/x/text/encoding -golang.org/x/text/encoding/charmap -golang.org/x/text/encoding/htmlindex -golang.org/x/text/encoding/internal -golang.org/x/text/encoding/internal/identifier -golang.org/x/text/encoding/japanese -golang.org/x/text/encoding/korean -golang.org/x/text/encoding/simplifiedchinese -golang.org/x/text/encoding/traditionalchinese -golang.org/x/text/encoding/unicode -golang.org/x/text/internal -golang.org/x/text/internal/colltab -golang.org/x/text/internal/language -golang.org/x/text/internal/language/compact -golang.org/x/text/internal/tag -golang.org/x/text/internal/utf8internal -golang.org/x/text/language -golang.org/x/text/runes -golang.org/x/text/secure/bidirule -golang.org/x/text/transform -golang.org/x/text/unicode/bidi -golang.org/x/text/unicode/norm -# golang.org/x/time v0.0.0-20191024005414-555d28b269f0 -golang.org/x/time/rate -# golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 -golang.org/x/tools/cmd/goimports -golang.org/x/tools/cmd/stringer -golang.org/x/tools/go/analysis -golang.org/x/tools/go/analysis/passes/inspect -golang.org/x/tools/go/ast/astutil -golang.org/x/tools/go/ast/inspector -golang.org/x/tools/go/buildutil -golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/gcimporter -golang.org/x/tools/go/internal/packagesdriver -golang.org/x/tools/go/packages -golang.org/x/tools/go/types/objectpath -golang.org/x/tools/go/types/typeutil -golang.org/x/tools/go/vcs -golang.org/x/tools/internal/fastwalk -golang.org/x/tools/internal/gopathwalk -golang.org/x/tools/internal/imports -golang.org/x/tools/internal/packagesinternal -# golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 -golang.org/x/xerrors -golang.org/x/xerrors/internal -# google.golang.org/api v0.15.0 -google.golang.org/api/cloudfunctions/v1 -google.golang.org/api/compute/v1 -google.golang.org/api/googleapi -google.golang.org/api/googleapi/transport -google.golang.org/api/internal -google.golang.org/api/internal/gensupport -google.golang.org/api/internal/third_party/uritemplates -google.golang.org/api/iterator -google.golang.org/api/option -google.golang.org/api/storage/v1 -google.golang.org/api/support/bundler -google.golang.org/api/transport -google.golang.org/api/transport/grpc -google.golang.org/api/transport/http -google.golang.org/api/transport/http/internal/propagation -# google.golang.org/appengine v1.6.5 -google.golang.org/appengine -google.golang.org/appengine/cloudsql -google.golang.org/appengine/internal -google.golang.org/appengine/internal/app_identity -google.golang.org/appengine/internal/base -google.golang.org/appengine/internal/datastore -google.golang.org/appengine/internal/log -google.golang.org/appengine/internal/modules -google.golang.org/appengine/internal/remote_api -google.golang.org/appengine/internal/socket -google.golang.org/appengine/internal/urlfetch -google.golang.org/appengine/socket -google.golang.org/appengine/urlfetch -# google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb -google.golang.org/genproto/googleapis/api -google.golang.org/genproto/googleapis/api/annotations -google.golang.org/genproto/googleapis/api/distribution -google.golang.org/genproto/googleapis/api/httpbody -google.golang.org/genproto/googleapis/api/label -google.golang.org/genproto/googleapis/api/metric -google.golang.org/genproto/googleapis/api/monitoredres -google.golang.org/genproto/googleapis/datastore/v1 -google.golang.org/genproto/googleapis/iam/v1 -google.golang.org/genproto/googleapis/monitoring/v3 -google.golang.org/genproto/googleapis/pubsub/v1 -google.golang.org/genproto/googleapis/rpc/code -google.golang.org/genproto/googleapis/rpc/status -google.golang.org/genproto/googleapis/type/calendarperiod -google.golang.org/genproto/googleapis/type/expr -google.golang.org/genproto/googleapis/type/latlng -google.golang.org/genproto/protobuf/field_mask -# google.golang.org/grpc v1.29.1 -google.golang.org/grpc -google.golang.org/grpc/attributes -google.golang.org/grpc/backoff -google.golang.org/grpc/balancer -google.golang.org/grpc/balancer/base -google.golang.org/grpc/balancer/grpclb -google.golang.org/grpc/balancer/grpclb/grpc_lb_v1 -google.golang.org/grpc/balancer/roundrobin -google.golang.org/grpc/binarylog/grpc_binarylog_v1 -google.golang.org/grpc/codes -google.golang.org/grpc/connectivity -google.golang.org/grpc/credentials -google.golang.org/grpc/credentials/alts -google.golang.org/grpc/credentials/alts/internal -google.golang.org/grpc/credentials/alts/internal/authinfo -google.golang.org/grpc/credentials/alts/internal/conn -google.golang.org/grpc/credentials/alts/internal/handshaker -google.golang.org/grpc/credentials/alts/internal/handshaker/service -google.golang.org/grpc/credentials/alts/internal/proto/grpc_gcp -google.golang.org/grpc/credentials/google -google.golang.org/grpc/credentials/internal -google.golang.org/grpc/credentials/oauth -google.golang.org/grpc/encoding -google.golang.org/grpc/encoding/proto -google.golang.org/grpc/grpclog -google.golang.org/grpc/internal -google.golang.org/grpc/internal/backoff -google.golang.org/grpc/internal/balancerload -google.golang.org/grpc/internal/binarylog -google.golang.org/grpc/internal/buffer -google.golang.org/grpc/internal/channelz -google.golang.org/grpc/internal/envconfig -google.golang.org/grpc/internal/grpclog -google.golang.org/grpc/internal/grpcrand -google.golang.org/grpc/internal/grpcsync -google.golang.org/grpc/internal/grpcutil -google.golang.org/grpc/internal/resolver/dns -google.golang.org/grpc/internal/resolver/passthrough -google.golang.org/grpc/internal/status -google.golang.org/grpc/internal/syscall -google.golang.org/grpc/internal/transport -google.golang.org/grpc/keepalive -google.golang.org/grpc/metadata -google.golang.org/grpc/naming -google.golang.org/grpc/peer -google.golang.org/grpc/resolver -google.golang.org/grpc/serviceconfig -google.golang.org/grpc/stats -google.golang.org/grpc/status -google.golang.org/grpc/tap -# google.golang.org/protobuf v1.23.0 -google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo -google.golang.org/protobuf/compiler/protogen -google.golang.org/protobuf/encoding/protojson -google.golang.org/protobuf/encoding/prototext -google.golang.org/protobuf/encoding/protowire -google.golang.org/protobuf/internal/descfmt -google.golang.org/protobuf/internal/descopts -google.golang.org/protobuf/internal/detectknown -google.golang.org/protobuf/internal/detrand -google.golang.org/protobuf/internal/encoding/defval -google.golang.org/protobuf/internal/encoding/json -google.golang.org/protobuf/internal/encoding/messageset -google.golang.org/protobuf/internal/encoding/tag -google.golang.org/protobuf/internal/encoding/text -google.golang.org/protobuf/internal/errors -google.golang.org/protobuf/internal/fieldnum -google.golang.org/protobuf/internal/fieldsort -google.golang.org/protobuf/internal/filedesc -google.golang.org/protobuf/internal/filetype -google.golang.org/protobuf/internal/flags -google.golang.org/protobuf/internal/genname -google.golang.org/protobuf/internal/impl -google.golang.org/protobuf/internal/mapsort -google.golang.org/protobuf/internal/pragma -google.golang.org/protobuf/internal/set -google.golang.org/protobuf/internal/strs -google.golang.org/protobuf/internal/version -google.golang.org/protobuf/proto -google.golang.org/protobuf/reflect/protodesc -google.golang.org/protobuf/reflect/protoreflect -google.golang.org/protobuf/reflect/protoregistry -google.golang.org/protobuf/runtime/protoiface -google.golang.org/protobuf/runtime/protoimpl -google.golang.org/protobuf/types/descriptorpb -google.golang.org/protobuf/types/known/anypb -google.golang.org/protobuf/types/known/durationpb -google.golang.org/protobuf/types/known/emptypb -google.golang.org/protobuf/types/known/structpb -google.golang.org/protobuf/types/known/timestamppb -google.golang.org/protobuf/types/known/wrapperspb -google.golang.org/protobuf/types/pluginpb -# gopkg.in/inf.v0 v0.9.1 -gopkg.in/inf.v0 -# gopkg.in/jcmturner/aescts.v1 v1.0.1 -gopkg.in/jcmturner/aescts.v1 -# gopkg.in/jcmturner/dnsutils.v1 v1.0.1 -gopkg.in/jcmturner/dnsutils.v1 -# gopkg.in/jcmturner/goidentity.v3 v3.0.0 -gopkg.in/jcmturner/goidentity.v3 -# gopkg.in/jcmturner/gokrb5.v7 v7.5.0 -gopkg.in/jcmturner/gokrb5.v7/asn1tools -gopkg.in/jcmturner/gokrb5.v7/client -gopkg.in/jcmturner/gokrb5.v7/config -gopkg.in/jcmturner/gokrb5.v7/credentials -gopkg.in/jcmturner/gokrb5.v7/crypto -gopkg.in/jcmturner/gokrb5.v7/crypto/common -gopkg.in/jcmturner/gokrb5.v7/crypto/etype -gopkg.in/jcmturner/gokrb5.v7/crypto/rfc3961 -gopkg.in/jcmturner/gokrb5.v7/crypto/rfc3962 -gopkg.in/jcmturner/gokrb5.v7/crypto/rfc4757 -gopkg.in/jcmturner/gokrb5.v7/crypto/rfc8009 -gopkg.in/jcmturner/gokrb5.v7/gssapi -gopkg.in/jcmturner/gokrb5.v7/iana -gopkg.in/jcmturner/gokrb5.v7/iana/addrtype -gopkg.in/jcmturner/gokrb5.v7/iana/adtype -gopkg.in/jcmturner/gokrb5.v7/iana/asnAppTag -gopkg.in/jcmturner/gokrb5.v7/iana/chksumtype -gopkg.in/jcmturner/gokrb5.v7/iana/errorcode -gopkg.in/jcmturner/gokrb5.v7/iana/etypeID -gopkg.in/jcmturner/gokrb5.v7/iana/flags -gopkg.in/jcmturner/gokrb5.v7/iana/keyusage -gopkg.in/jcmturner/gokrb5.v7/iana/msgtype -gopkg.in/jcmturner/gokrb5.v7/iana/nametype -gopkg.in/jcmturner/gokrb5.v7/iana/patype -gopkg.in/jcmturner/gokrb5.v7/kadmin -gopkg.in/jcmturner/gokrb5.v7/keytab -gopkg.in/jcmturner/gokrb5.v7/krberror -gopkg.in/jcmturner/gokrb5.v7/messages -gopkg.in/jcmturner/gokrb5.v7/pac -gopkg.in/jcmturner/gokrb5.v7/service -gopkg.in/jcmturner/gokrb5.v7/spnego -gopkg.in/jcmturner/gokrb5.v7/types -# gopkg.in/jcmturner/rpc.v1 v1.1.0 -gopkg.in/jcmturner/rpc.v1/mstypes -gopkg.in/jcmturner/rpc.v1/ndr -# gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 -gopkg.in/mgo.v2 -gopkg.in/mgo.v2/bson -gopkg.in/mgo.v2/internal/json -gopkg.in/mgo.v2/internal/sasl -gopkg.in/mgo.v2/internal/scram -# gopkg.in/yaml.v2 v2.3.0 -gopkg.in/yaml.v2 -# honnef.co/go/tools v0.0.1-2019.2.3 -honnef.co/go/tools/arg -honnef.co/go/tools/cmd/staticcheck -honnef.co/go/tools/config -honnef.co/go/tools/deprecated -honnef.co/go/tools/facts -honnef.co/go/tools/functions -honnef.co/go/tools/go/types/typeutil -honnef.co/go/tools/internal/cache -honnef.co/go/tools/internal/passes/buildssa -honnef.co/go/tools/internal/renameio -honnef.co/go/tools/internal/sharedcheck -honnef.co/go/tools/lint -honnef.co/go/tools/lint/lintdsl -honnef.co/go/tools/lint/lintutil -honnef.co/go/tools/lint/lintutil/format -honnef.co/go/tools/loader -honnef.co/go/tools/printf -honnef.co/go/tools/simple -honnef.co/go/tools/ssa -honnef.co/go/tools/ssautil -honnef.co/go/tools/staticcheck -honnef.co/go/tools/staticcheck/vrp -honnef.co/go/tools/stylecheck -honnef.co/go/tools/unused -honnef.co/go/tools/version -# howett.net/plist v0.0.0-20181124034731-591f970eefbb -howett.net/plist -# k8s.io/api v0.18.3 -k8s.io/api/admissionregistration/v1 -k8s.io/api/admissionregistration/v1beta1 -k8s.io/api/apps/v1 -k8s.io/api/apps/v1beta1 -k8s.io/api/apps/v1beta2 -k8s.io/api/auditregistration/v1alpha1 -k8s.io/api/authentication/v1 -k8s.io/api/authentication/v1beta1 -k8s.io/api/authorization/v1 -k8s.io/api/authorization/v1beta1 -k8s.io/api/autoscaling/v1 -k8s.io/api/autoscaling/v2beta1 -k8s.io/api/autoscaling/v2beta2 -k8s.io/api/batch/v1 -k8s.io/api/batch/v1beta1 -k8s.io/api/batch/v2alpha1 -k8s.io/api/certificates/v1beta1 -k8s.io/api/coordination/v1 -k8s.io/api/coordination/v1beta1 -k8s.io/api/core/v1 -k8s.io/api/discovery/v1alpha1 -k8s.io/api/discovery/v1beta1 -k8s.io/api/events/v1beta1 -k8s.io/api/extensions/v1beta1 -k8s.io/api/flowcontrol/v1alpha1 -k8s.io/api/networking/v1 -k8s.io/api/networking/v1beta1 -k8s.io/api/node/v1alpha1 -k8s.io/api/node/v1beta1 -k8s.io/api/policy/v1beta1 -k8s.io/api/rbac/v1 -k8s.io/api/rbac/v1alpha1 -k8s.io/api/rbac/v1beta1 -k8s.io/api/scheduling/v1 -k8s.io/api/scheduling/v1alpha1 -k8s.io/api/scheduling/v1beta1 -k8s.io/api/settings/v1alpha1 -k8s.io/api/storage/v1 -k8s.io/api/storage/v1alpha1 -k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.18.3 -k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/api/meta -k8s.io/apimachinery/pkg/api/resource -k8s.io/apimachinery/pkg/apis/meta/internalversion -k8s.io/apimachinery/pkg/apis/meta/v1 -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/apis/meta/v1beta1 -k8s.io/apimachinery/pkg/conversion -k8s.io/apimachinery/pkg/conversion/queryparams -k8s.io/apimachinery/pkg/fields -k8s.io/apimachinery/pkg/labels -k8s.io/apimachinery/pkg/runtime -k8s.io/apimachinery/pkg/runtime/schema -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/runtime/serializer/json -k8s.io/apimachinery/pkg/runtime/serializer/protobuf -k8s.io/apimachinery/pkg/runtime/serializer/recognizer -k8s.io/apimachinery/pkg/runtime/serializer/streaming -k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/selection -k8s.io/apimachinery/pkg/types -k8s.io/apimachinery/pkg/util/cache -k8s.io/apimachinery/pkg/util/clock -k8s.io/apimachinery/pkg/util/diff -k8s.io/apimachinery/pkg/util/errors -k8s.io/apimachinery/pkg/util/framer -k8s.io/apimachinery/pkg/util/httpstream -k8s.io/apimachinery/pkg/util/httpstream/spdy -k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/util/json -k8s.io/apimachinery/pkg/util/mergepatch -k8s.io/apimachinery/pkg/util/naming -k8s.io/apimachinery/pkg/util/net -k8s.io/apimachinery/pkg/util/runtime -k8s.io/apimachinery/pkg/util/sets -k8s.io/apimachinery/pkg/util/strategicpatch -k8s.io/apimachinery/pkg/util/validation -k8s.io/apimachinery/pkg/util/validation/field -k8s.io/apimachinery/pkg/util/wait -k8s.io/apimachinery/pkg/util/yaml -k8s.io/apimachinery/pkg/version -k8s.io/apimachinery/pkg/watch -k8s.io/apimachinery/third_party/forked/golang/json -k8s.io/apimachinery/third_party/forked/golang/netutil -k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.18.3 -k8s.io/client-go/discovery -k8s.io/client-go/discovery/fake -k8s.io/client-go/kubernetes -k8s.io/client-go/kubernetes/fake -k8s.io/client-go/kubernetes/scheme -k8s.io/client-go/kubernetes/typed/admissionregistration/v1 -k8s.io/client-go/kubernetes/typed/admissionregistration/v1/fake -k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 -k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake -k8s.io/client-go/kubernetes/typed/apps/v1 -k8s.io/client-go/kubernetes/typed/apps/v1/fake -k8s.io/client-go/kubernetes/typed/apps/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake -k8s.io/client-go/kubernetes/typed/apps/v1beta2 -k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake -k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1 -k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/authentication/v1 -k8s.io/client-go/kubernetes/typed/authentication/v1/fake -k8s.io/client-go/kubernetes/typed/authentication/v1beta1 -k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake -k8s.io/client-go/kubernetes/typed/authorization/v1 -k8s.io/client-go/kubernetes/typed/authorization/v1/fake -k8s.io/client-go/kubernetes/typed/authorization/v1beta1 -k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake -k8s.io/client-go/kubernetes/typed/autoscaling/v1 -k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake -k8s.io/client-go/kubernetes/typed/batch/v1 -k8s.io/client-go/kubernetes/typed/batch/v1/fake -k8s.io/client-go/kubernetes/typed/batch/v1beta1 -k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake -k8s.io/client-go/kubernetes/typed/batch/v2alpha1 -k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake -k8s.io/client-go/kubernetes/typed/certificates/v1beta1 -k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake -k8s.io/client-go/kubernetes/typed/coordination/v1 -k8s.io/client-go/kubernetes/typed/coordination/v1/fake -k8s.io/client-go/kubernetes/typed/coordination/v1beta1 -k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake -k8s.io/client-go/kubernetes/typed/core/v1 -k8s.io/client-go/kubernetes/typed/core/v1/fake -k8s.io/client-go/kubernetes/typed/discovery/v1alpha1 -k8s.io/client-go/kubernetes/typed/discovery/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/discovery/v1beta1 -k8s.io/client-go/kubernetes/typed/discovery/v1beta1/fake -k8s.io/client-go/kubernetes/typed/events/v1beta1 -k8s.io/client-go/kubernetes/typed/events/v1beta1/fake -k8s.io/client-go/kubernetes/typed/extensions/v1beta1 -k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake -k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1 -k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/networking/v1 -k8s.io/client-go/kubernetes/typed/networking/v1/fake -k8s.io/client-go/kubernetes/typed/networking/v1beta1 -k8s.io/client-go/kubernetes/typed/networking/v1beta1/fake -k8s.io/client-go/kubernetes/typed/node/v1alpha1 -k8s.io/client-go/kubernetes/typed/node/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/node/v1beta1 -k8s.io/client-go/kubernetes/typed/node/v1beta1/fake -k8s.io/client-go/kubernetes/typed/policy/v1beta1 -k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1 -k8s.io/client-go/kubernetes/typed/rbac/v1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 -k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1beta1 -k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake -k8s.io/client-go/kubernetes/typed/scheduling/v1 -k8s.io/client-go/kubernetes/typed/scheduling/v1/fake -k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 -k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 -k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake -k8s.io/client-go/kubernetes/typed/settings/v1alpha1 -k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/storage/v1 -k8s.io/client-go/kubernetes/typed/storage/v1/fake -k8s.io/client-go/kubernetes/typed/storage/v1alpha1 -k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/storage/v1beta1 -k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake -k8s.io/client-go/pkg/apis/clientauthentication -k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 -k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 -k8s.io/client-go/pkg/version -k8s.io/client-go/plugin/pkg/client/auth/exec -k8s.io/client-go/rest -k8s.io/client-go/rest/watch -k8s.io/client-go/testing -k8s.io/client-go/tools/auth -k8s.io/client-go/tools/cache -k8s.io/client-go/tools/clientcmd -k8s.io/client-go/tools/clientcmd/api -k8s.io/client-go/tools/clientcmd/api/latest -k8s.io/client-go/tools/clientcmd/api/v1 -k8s.io/client-go/tools/metrics -k8s.io/client-go/tools/pager -k8s.io/client-go/tools/portforward -k8s.io/client-go/tools/reference -k8s.io/client-go/tools/watch -k8s.io/client-go/transport -k8s.io/client-go/transport/spdy -k8s.io/client-go/util/cert -k8s.io/client-go/util/connrotation -k8s.io/client-go/util/flowcontrol -k8s.io/client-go/util/homedir -k8s.io/client-go/util/keyutil -k8s.io/client-go/util/workqueue -# k8s.io/klog v1.0.0 -k8s.io/klog -# k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 -k8s.io/kube-openapi/pkg/util/proto -# k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 -k8s.io/utils/buffer -k8s.io/utils/integer -k8s.io/utils/trace -# sigs.k8s.io/structured-merge-diff/v3 v3.0.0 -sigs.k8s.io/structured-merge-diff/v3/value -# sigs.k8s.io/yaml v1.2.0 -sigs.k8s.io/yaml diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 65c87f850c3c..844d810830d5 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile index 19f2ddf5c3dc..ac25e26ac2b6 100644 --- a/x-pack/libbeat/Dockerfile +++ b/x-pack/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \ From 6d53fb49a9b4443c75abc11654c8804dd1dd7bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Wed, 8 Jul 2020 19:39:42 +0200 Subject: [PATCH 2/8] add changelog entry --- CHANGELOG-developer.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 20b7c8f8a584..75da545123dd 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -95,3 +95,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Add IP* fields to `fields.yml` generator script in Filebeat. {issue}17998[17998] {pull}18256[18256] - Events intended for the Elasticsearch output can now take an `op_type` metadata field of type events.OpType or string to indicate the `op_type` to use for bulk indexing. {pull}12606[12606] - Remove vendor folder from repository. {pull}18655[18655] +- Update Go version to 1.14.4. {pull}19753[19753] From 664920649592091376e7c18058c3317f3b0ce11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 08:41:40 +0200 Subject: [PATCH 3/8] Remove UseVendor as it is recognized automatically --- dev-tools/mage/build.go | 10 ------- dev-tools/mage/common.go | 12 --------- dev-tools/mage/crossbuild.go | 3 --- dev-tools/mage/fields.go | 32 ++++++----------------- dev-tools/mage/fmt.go | 17 +++--------- dev-tools/mage/install.go | 3 --- dev-tools/mage/integtest.go | 3 --- dev-tools/mage/settings.go | 5 ---- docs/devguide/newbeat.asciidoc | 1 - metricbeat/scripts/mage/docs_collector.go | 3 --- 10 files changed, 12 insertions(+), 77 deletions(-) diff --git a/dev-tools/mage/build.go b/dev-tools/mage/build.go index d6ac3eb631f3..2efe61502ae2 100644 --- a/dev-tools/mage/build.go +++ b/dev-tools/mage/build.go @@ -118,16 +118,6 @@ 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/common.go b/dev-tools/mage/common.go index 91d291f53871..e4b93625b75c 100644 --- a/dev-tools/mage/common.go +++ b/dev-tools/mage/common.go @@ -49,8 +49,6 @@ import ( "github.com/magefile/mage/sh" "github.com/magefile/mage/target" "github.com/pkg/errors" - - "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) // Expand expands the given Go text/template string. @@ -806,16 +804,6 @@ func ParseVersion(version string) (major, minor, patch int, err error) { return } -// listModuleDir calls gotool.ListModuleVendorDir or -// gotool.ListModuleCacheDir, depending on the value of -// UseVendor. -func listModuleDir(modpath string) (string, error) { - if UseVendor { - return gotool.ListModuleVendorDir(modpath) - } - return gotool.ListModuleCacheDir(modpath) -} - // ListMatchingEnvVars returns all of the environment variables names that begin // with prefix. func ListMatchingEnvVars(prefixes ...string) []string { diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index d80276a79744..5362426aba2d 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -255,9 +255,6 @@ func (b GolangCrossBuilder) Build() error { if versionQualified { args = append(args, "--env", "VERSION_QUALIFIER="+versionQualifier) } - if UseVendor { - args = append(args, "--env", "GOFLAGS=-mod=vendor") - } if CrossBuildMountModcache { // Mount $GOPATH/pkg/mod into the container, read-only. hostDir := filepath.Join(build.Default.GOPATH, "pkg", "mod") diff --git a/dev-tools/mage/fields.go b/dev-tools/mage/fields.go index cb2b6ef76856..94c3f899e9e5 100644 --- a/dev-tools/mage/fields.go +++ b/dev-tools/mage/fields.go @@ -101,16 +101,12 @@ func generateFieldsYAML(baseDir, output string, moduleDirs ...string) error { return err } - cmd := []string{"run"} - if UseVendor { - cmd = append(cmd, "-mod", "vendor") - } - cmd = append(cmd, + cmd := []string{"run", filepath.Join(beatsDir, globalFieldsCmdPath), "-es_beats_path", beatsDir, "-beat_path", baseDir, "-out", CreateDir(output), - ) + } globalFieldsCmd := sh.RunCmd("go", cmd...) return globalFieldsCmd(moduleDirs...) @@ -130,18 +126,14 @@ func GenerateFieldsGo(fieldsYML, out string) error { return err } - cmd := []string{"run"} - if UseVendor { - cmd = append(cmd, "-mod", "vendor") - } - cmd = append(cmd, + cmd := []string{"run", filepath.Join(beatsDir, assetCmdPath), "-pkg", "include", "-in", fieldsYML, "-out", CreateDir(out), "-license", toLibbeatLicenseName(BeatLicense), BeatName, - ) + } assetCmd := sh.RunCmd("go", cmd...) return assetCmd() @@ -162,16 +154,12 @@ func GenerateModuleFieldsGo(moduleDir string) error { moduleDir = CWD(moduleDir) } - cmd := []string{"run"} - if UseVendor { - cmd = append(cmd, "-mod", "vendor") - } - cmd = append(cmd, + cmd := []string{"run", filepath.Join(beatsDir, moduleFieldsCmdPath), "-beat", BeatName, "-license", toLibbeatLicenseName(BeatLicense), moduleDir, - ) + } moduleFieldsCmd := sh.RunCmd("go", cmd...) return moduleFieldsCmd() @@ -194,16 +182,12 @@ func GenerateIncludeListGo(options IncludeListOptions) error { return err } - cmd := []string{"run"} - if UseVendor { - cmd = append(cmd, "-mod", "vendor") - } - cmd = append(cmd, + cmd := []string{"run", filepath.Join(beatsDir, moduleIncludeListCmdPath), "-license", toLibbeatLicenseName(BeatLicense), "-out", options.Outfile, "-buildTags", options.BuildTags, "-pkg", options.Pkg, - ) + } includeListCmd := sh.RunCmd("go", cmd...) diff --git a/dev-tools/mage/fmt.go b/dev-tools/mage/fmt.go index b4463696b816..ed034e3fc9af 100644 --- a/dev-tools/mage/fmt.go +++ b/dev-tools/mage/fmt.go @@ -66,19 +66,10 @@ func GoImports() error { } fmt.Println(">> fmt - goimports: Formatting Go code") - if UseVendor { - if err := gotool.Install( - gotool.Install.Vendored(), - gotool.Install.Package(filepath.Join(GoImportsImportPath)), - ); err != nil { - return err - } - } else { - if err := gotool.Install( - gotool.Install.Package(filepath.Join(GoImportsImportPath)), - ); err != nil { - return err - } + if err := gotool.Install( + gotool.Install.Package(filepath.Join(GoImportsImportPath)), + ); err != nil { + return err } args := append( diff --git a/dev-tools/mage/install.go b/dev-tools/mage/install.go index 67483d23bb9f..5220eb25be30 100644 --- a/dev-tools/mage/install.go +++ b/dev-tools/mage/install.go @@ -37,9 +37,6 @@ func InstallVendored(importPath string) error { // InstallGoLicenser target installs go-licenser func InstallGoLicenser() error { - 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 064dc7d8102b..e932a55c45d2 100644 --- a/dev-tools/mage/integtest.go +++ b/dev-tools/mage/integtest.go @@ -245,9 +245,6 @@ func initRunner(tester IntegrationTester, dir string, passInEnv map[string]strin if mg.Verbose() { env["MAGEFILE_VERBOSE"] = "1" } - if UseVendor { - env["GOFLAGS"] = "-mod=vendor" - } runner := &IntegrationRunner{ steps: runnerSteps, diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index fb7644a90b2c..cdfd915c3aa1 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -60,7 +60,6 @@ var ( XPackDir = "../x-pack" RaceDetector = false TestCoverage = false - UseVendor = false // CrossBuildMountModcache, if true, mounts $GOPATH/pkg/mod into // the crossbuild images at /go/pkg/mod, read-only. @@ -110,10 +109,6 @@ func init() { if err != nil { panic(errors.Wrap(err, "failed to parse TEST_COVERAGE env value")) } - UseVendor, err = strconv.ParseBool(EnvOr("USE_VENDOR", "false")) - if err != nil { - panic(errors.Wrap(err, "failed to parse USE_VENDOR env value")) - } Snapshot, err = strconv.ParseBool(EnvOr("SNAPSHOT", "false")) if err != nil { diff --git a/docs/devguide/newbeat.asciidoc b/docs/devguide/newbeat.asciidoc index 5c9d427e0f9b..d5c914850c1a 100644 --- a/docs/devguide/newbeat.asciidoc +++ b/docs/devguide/newbeat.asciidoc @@ -526,6 +526,5 @@ Please note that it is your choice whether you put dependencies in the folder ve If you choose to abandon the vendor folder, you have to adjust the following things in your Beat: -* add `devtools.UseVendor = false` to the `magefile.go` of your Beat * add `devtools.CrossBuildMountModcache = true` to the `magefile.go` of your Beat * modify the path to `ES_BEATS` in the `Makefile` so it points to the folder under the module cache (`go list -m -f '{{.Dir}}' $ES_BEATS_IMPORT_PATH`) diff --git a/metricbeat/scripts/mage/docs_collector.go b/metricbeat/scripts/mage/docs_collector.go index 427975a7cf10..b58bad3edae1 100644 --- a/metricbeat/scripts/mage/docs_collector.go +++ b/metricbeat/scripts/mage/docs_collector.go @@ -147,9 +147,6 @@ func getDefaultMetricsets() (map[string][]string, error) { } cmd := []string{"run"} - if mage.UseVendor { - cmd = append(cmd, "-mod", "vendor") - } for _, dir := range runpaths { rawMap, err := sh.OutCmd("go", append(cmd, dir)...)() if err != nil { From 15b899b4901421028f0a0f3c9bcdf1be3f4964ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 09:53:35 +0200 Subject: [PATCH 4/8] tmp --- dev-tools/mage/godaemon.go | 4 +++- dev-tools/mage/gomod.go | 2 +- dev-tools/mage/gotool/go.go | 14 +++++++++++--- dev-tools/mage/settings.go | 2 +- generator/common/Makefile | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dev-tools/mage/godaemon.go b/dev-tools/mage/godaemon.go index 7397dac74d9d..b580bc3ed5e2 100644 --- a/dev-tools/mage/godaemon.go +++ b/dev-tools/mage/godaemon.go @@ -22,6 +22,8 @@ import ( "log" "os" "path/filepath" + + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( @@ -43,7 +45,7 @@ func BuildGoDaemon() error { } // Test if binaries are up-to-date. - godaemonDir, err := listModuleDir("github.com/tsg/go-daemon") + godaemonDir, err := gotool.ListModuleCacheDir("github.com/tsg/go-daemon") if err != nil { return err } diff --git a/dev-tools/mage/gomod.go b/dev-tools/mage/gomod.go index 11ad159b8413..7805934e7ac3 100644 --- a/dev-tools/mage/gomod.go +++ b/dev-tools/mage/gomod.go @@ -36,7 +36,7 @@ type CopyModule struct { // CopyFilesToVendor copies packages which require the whole tree func CopyFilesToVendor(vendorFolder string, modulesToCopy []CopyModule) error { for _, p := range modulesToCopy { - path, err := gotool.ListModuleCacheDir(p.Name) + path, err := gotool.ListModuleForceCacheDir(p.Name) if err != nil { return errors.Wrapf(err, "error while looking up cached dir of module: %s", p.Name) } diff --git a/dev-tools/mage/gotool/go.go b/dev-tools/mage/gotool/go.go index 9022e0c01377..5f58e56d221a 100644 --- a/dev-tools/mage/gotool/go.go +++ b/dev-tools/mage/gotool/go.go @@ -97,17 +97,23 @@ func ListTestFiles(pkg string) ([]string, error) { // the specified module. If the module does not exist in the cache, // an error will be returned. func ListModuleCacheDir(pkg string) (string, error) { - return listModuleDir(pkg, false) + return listModuleDir(pkg, false, false) } // ListModuleVendorDir returns the vendor directory containing the // specified module. If the module has not been vendored, an error // will be returned. func ListModuleVendorDir(pkg string) (string, error) { - return listModuleDir(pkg, true) + return listModuleDir(pkg, true, false) } -func listModuleDir(pkg string, vendor bool) (string, error) { +// ListModuleForceCacheDir returns the module cache directory containing the +// specified module even if the repo has a vendor folder. +func ListModuleForceCacheDir(pkg string) (string, error) { + return listModuleDir(pkg, false, true) +} + +func listModuleDir(pkg string, vendor, force bool) (string, error) { env := map[string]string{ // Make sure GOFLAGS does not influence behaviour. "GOFLAGS": "", @@ -115,6 +121,8 @@ func listModuleDir(pkg string, vendor bool) (string, error) { args := []string{"-m", "-f", "{{.Dir}}"} if vendor { args = append(args, "-mod=vendor") + } else if force { + args = append(args, "-mod=mod") } args = append(args, pkg) lines, err := getLines(callGo(env, "list", args...)) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index cdfd915c3aa1..2473202648ed 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -281,7 +281,7 @@ func findElasticBeatsDir() (string, error) { if repo.IsElasticBeats() { return repo.RootDir, nil } - return listModuleDir(elasticBeatsModulePath) + return gotool.ListModuleCacheDir(elasticBeatsModulePath) } var ( diff --git a/generator/common/Makefile b/generator/common/Makefile index 8d82a444e84c..e72e07a09d78 100644 --- a/generator/common/Makefile +++ b/generator/common/Makefile @@ -38,7 +38,7 @@ prepare-test:: mage export NEWBEAT_TYPE=${BEAT_TYPE} ; \ export NEWBEAT_DEV=1 ; \ export NEWBEAT_BEATS_REVISION=$(shell git rev-parse origin/master) ; \ - mage GenerateCustomBeat + mage -v GenerateCustomBeat # Runs test build for the created beat .PHONY: test-build From e477db9a8d62ed276d513619adeb4ec2600a5110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 12:09:10 +0200 Subject: [PATCH 5/8] abandon vendoring in generated beats --- dev-tools/mage/gomod.go | 2 +- dev-tools/mage/gotool/go.go | 14 ++------ docs/devguide/newbeat.asciidoc | 3 -- generator/_templates/beat/{beat}/Makefile | 2 +- generator/_templates/beat/{beat}/magefile.go | 1 + .../_templates/metricbeat/{beat}/Makefile | 6 +--- .../_templates/metricbeat/{beat}/magefile.go | 1 + generator/common/Makefile | 2 +- generator/common/beatgen/beatgen.go | 12 ------- generator/common/beatgen/setup/setup.go | 36 ------------------- 10 files changed, 9 insertions(+), 70 deletions(-) diff --git a/dev-tools/mage/gomod.go b/dev-tools/mage/gomod.go index 7805934e7ac3..11ad159b8413 100644 --- a/dev-tools/mage/gomod.go +++ b/dev-tools/mage/gomod.go @@ -36,7 +36,7 @@ type CopyModule struct { // CopyFilesToVendor copies packages which require the whole tree func CopyFilesToVendor(vendorFolder string, modulesToCopy []CopyModule) error { for _, p := range modulesToCopy { - path, err := gotool.ListModuleForceCacheDir(p.Name) + path, err := gotool.ListModuleCacheDir(p.Name) if err != nil { return errors.Wrapf(err, "error while looking up cached dir of module: %s", p.Name) } diff --git a/dev-tools/mage/gotool/go.go b/dev-tools/mage/gotool/go.go index 5f58e56d221a..9022e0c01377 100644 --- a/dev-tools/mage/gotool/go.go +++ b/dev-tools/mage/gotool/go.go @@ -97,23 +97,17 @@ func ListTestFiles(pkg string) ([]string, error) { // the specified module. If the module does not exist in the cache, // an error will be returned. func ListModuleCacheDir(pkg string) (string, error) { - return listModuleDir(pkg, false, false) + return listModuleDir(pkg, false) } // ListModuleVendorDir returns the vendor directory containing the // specified module. If the module has not been vendored, an error // will be returned. func ListModuleVendorDir(pkg string) (string, error) { - return listModuleDir(pkg, true, false) + return listModuleDir(pkg, true) } -// ListModuleForceCacheDir returns the module cache directory containing the -// specified module even if the repo has a vendor folder. -func ListModuleForceCacheDir(pkg string) (string, error) { - return listModuleDir(pkg, false, true) -} - -func listModuleDir(pkg string, vendor, force bool) (string, error) { +func listModuleDir(pkg string, vendor bool) (string, error) { env := map[string]string{ // Make sure GOFLAGS does not influence behaviour. "GOFLAGS": "", @@ -121,8 +115,6 @@ func listModuleDir(pkg string, vendor, force bool) (string, error) { args := []string{"-m", "-f", "{{.Dir}}"} if vendor { args = append(args, "-mod=vendor") - } else if force { - args = append(args, "-mod=mod") } args = append(args, pkg) lines, err := getLines(callGo(env, "list", args...)) diff --git a/docs/devguide/newbeat.asciidoc b/docs/devguide/newbeat.asciidoc index d5c914850c1a..a7f239f22fce 100644 --- a/docs/devguide/newbeat.asciidoc +++ b/docs/devguide/newbeat.asciidoc @@ -515,9 +515,6 @@ To depend on the latest `master` of `github.com/elastic/beats` run the following go get github.com/elastic/beats@master ---------------------------------------------------------------------- -To move the dependencies to vendor, you need to manually fetch the new -`magefile.go` for newly generated Beats from the dev-tools of `elastic/beats`. - We suggest you read the following section to learn about maintaining dependencies using go modules: * https://github.com/golang/go/wiki/Modules#how-to-upgrade-and-downgrade-dependencies[How to upgrade and downgrade dependencies] diff --git a/generator/_templates/beat/{beat}/Makefile b/generator/_templates/beat/{beat}/Makefile index 6ad41d814564..94fe41315034 100644 --- a/generator/_templates/beat/{beat}/Makefile +++ b/generator/_templates/beat/{beat}/Makefile @@ -4,7 +4,7 @@ BEAT_GOPATH=$(firstword $(subst :, ,${GOPATH})) SYSTEM_TESTS=false TEST_ENVIRONMENT=false ES_BEATS_IMPORT_PATH=github.com/elastic/beats/v7 -ES_BEATS?=./vendor/${ES_BEATS_IMPORT_PATH} +ES_BEATS?=$(shell go list -m -f '{{.Dir}}' ${ES_BEATS_IMPORT_PATH}) LIBBEAT_MAKEFILE=$(ES_BEATS)/libbeat/scripts/Makefile GOPACKAGES=$(shell go list ${BEAT_PATH}/... | grep -v /tools) GOBUILD_FLAGS=-i -ldflags "-X ${ES_BEATS_IMPORT_PATH}/libbeat/version.buildTime=$(NOW) -X ${ES_BEATS_IMPORT_PATH}/libbeat/version.commit=$(COMMIT_ID)" diff --git a/generator/_templates/beat/{beat}/magefile.go b/generator/_templates/beat/{beat}/magefile.go index 28638df0f0ad..89969887bb71 100644 --- a/generator/_templates/beat/{beat}/magefile.go +++ b/generator/_templates/beat/{beat}/magefile.go @@ -23,6 +23,7 @@ func init() { devtools.BeatDescription = "One sentence description of the Beat." devtools.BeatVendor = "{full_name}" devtools.BeatProjectType = devtools.CommunityProject + devtools.CrossBuildMountModcache = true } // VendorUpdate updates the vendor dir diff --git a/generator/_templates/metricbeat/{beat}/Makefile b/generator/_templates/metricbeat/{beat}/Makefile index 453344c8feb1..ebdc51b72fb3 100644 --- a/generator/_templates/metricbeat/{beat}/Makefile +++ b/generator/_templates/metricbeat/{beat}/Makefile @@ -4,7 +4,7 @@ BEAT_GOPATH=$(firstword $(subst :, ,${GOPATH})) SYSTEM_TESTS=false TEST_ENVIRONMENT=false ES_BEATS_IMPORT_PATH=github.com/elastic/beats/v7 -ES_BEATS?=./vendor/${ES_BEATS_IMPORT_PATH} +ES_BEATS?=$(shell go list -m -f '{{.Dir}}' ${ES_BEATS_IMPORT_PATH}) GOPACKAGES=$(shell go list ${BEAT_PATH}/... | grep -v /tools) GOBUILD_FLAGS=-i -ldflags "-X ${ES_BEATS_IMPORT_PATH}/libbeat/version.buildTime=$(NOW) -X ${ES_BEATS_IMPORT_PATH}/libbeat/version.commit=$(COMMIT_ID)" MAGE_IMPORT_PATH=github.com/magefile/mage @@ -12,7 +12,3 @@ CHECK_HEADERS_DISABLED=true # Path to the libbeat Makefile -include $(ES_BEATS)/metricbeat/Makefile - -.PHONY: copy-vendor -copy-vendor: - mage vendorUpdate diff --git a/generator/_templates/metricbeat/{beat}/magefile.go b/generator/_templates/metricbeat/{beat}/magefile.go index 8805fc36a32c..104d1f2d9db5 100644 --- a/generator/_templates/metricbeat/{beat}/magefile.go +++ b/generator/_templates/metricbeat/{beat}/magefile.go @@ -26,6 +26,7 @@ func init() { devtools.BeatDescription = "One sentence description of the Beat." devtools.BeatVendor = "{full_name}" + devtools.CrossBuildMountModcache = true } // VendorUpdate updates elastic/beats/v7 in the vendor dir diff --git a/generator/common/Makefile b/generator/common/Makefile index e72e07a09d78..8d82a444e84c 100644 --- a/generator/common/Makefile +++ b/generator/common/Makefile @@ -38,7 +38,7 @@ prepare-test:: mage export NEWBEAT_TYPE=${BEAT_TYPE} ; \ export NEWBEAT_DEV=1 ; \ export NEWBEAT_BEATS_REVISION=$(shell git rev-parse origin/master) ; \ - mage -v GenerateCustomBeat + mage GenerateCustomBeat # Runs test build for the created beat .PHONY: test-build diff --git a/generator/common/beatgen/beatgen.go b/generator/common/beatgen/beatgen.go index 72c25c7f30c0..a86ab69cd472 100644 --- a/generator/common/beatgen/beatgen.go +++ b/generator/common/beatgen/beatgen.go @@ -126,7 +126,6 @@ func Generate() error { return errors.Wrap(err, "error while getting required beats version") } - mg.Deps(setup.CopyVendor) mg.Deps(setup.GitInit) if cfg["type"] == "metricbeat" { @@ -156,17 +155,6 @@ func getConfiguredBeatsRevision(beatsModule, revision string) error { ) } -// VendorUpdate updates the vendor directory if used -func VendorUpdate() error { - err := sh.Rm("./vendor/github.com/elastic/beats") - if err != nil { - return errors.Wrap(err, "error removing vendor dir") - } - - devtools.SetElasticBeatsDir(getAbsoluteBeatsPath()) - return setup.CopyVendor() -} - // returns a "compleated" config object with everything we need func getConfig() (map[string]string, error) { userCfg := make(map[string]string) diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index 42098c40f4de..d30e06489c72 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -95,42 +95,6 @@ func copyReplacedModules() error { return w.Flush() } -// CopyVendor copies a new version of the dependencies to the vendor folder -func CopyVendor() error { - err := gotool.Mod.Vendor() - if err != nil { - return errors.Wrapf(err, "error while running go mod vendor") - } - - err = devtools.CopyFilesToVendor( - "./vendor", - []devtools.CopyModule{ - devtools.CopyModule{ - Name: "github.com/elastic/beats/v7", - FilesToCopy: []string{ - "dev-tools", - "libbeat", - "licenses", - "metricbeat", - "script", - ".go-version", - }, - }, - devtools.CopyModule{ - Name: "github.com/tsg/go-daemon", - FilesToCopy: []string{ - "src", - }, - }, - }, - ) - if err != nil { - return errors.Wrapf(err, "error while copying required files to vendor") - } - - return nil -} - // GitInit initializes a new git repo in the current directory func GitInit() error { return sh.Run("git", "init") From 0442c3385adb03cc2ea6b30a3cca1fc048abfa36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 12:31:52 +0200 Subject: [PATCH 6/8] minor adjustments --- NOTICE.txt | 4 ++-- generator/_templates/beat/{beat}/magefile.go | 6 ------ generator/_templates/metricbeat/{beat}/magefile.go | 6 ------ generator/common/beatgen/beatgen.go | 11 +++++++++++ go.mod | 2 +- go.sum | 5 +++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 97ddd49332dc..8cbfd211c6e9 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -15626,11 +15626,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/tools -Version: v0.0.0-20200615191743-991d59a616de +Version: v0.0.0-20200602230032-c00d67ef29d0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.0.0-20200615191743-991d59a616de/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.0.0-20200602230032-c00d67ef29d0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/generator/_templates/beat/{beat}/magefile.go b/generator/_templates/beat/{beat}/magefile.go index 89969887bb71..b8dd789f4188 100644 --- a/generator/_templates/beat/{beat}/magefile.go +++ b/generator/_templates/beat/{beat}/magefile.go @@ -14,7 +14,6 @@ import ( "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() { @@ -26,11 +25,6 @@ func init() { devtools.CrossBuildMountModcache = true } -// VendorUpdate updates 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. diff --git a/generator/_templates/metricbeat/{beat}/magefile.go b/generator/_templates/metricbeat/{beat}/magefile.go index 104d1f2d9db5..c05ac7623b31 100644 --- a/generator/_templates/metricbeat/{beat}/magefile.go +++ b/generator/_templates/metricbeat/{beat}/magefile.go @@ -14,7 +14,6 @@ import ( "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" metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" // mage:import @@ -29,11 +28,6 @@ func init() { devtools.CrossBuildMountModcache = true } -// 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) diff --git a/generator/common/beatgen/beatgen.go b/generator/common/beatgen/beatgen.go index a86ab69cd472..3cb101aa625b 100644 --- a/generator/common/beatgen/beatgen.go +++ b/generator/common/beatgen/beatgen.go @@ -155,6 +155,17 @@ func getConfiguredBeatsRevision(beatsModule, revision string) error { ) } +// VendorUpdate updates the vendor directory if used +func VendorUpdate() error { + err := sh.Rm("./vendor/github.com/elastic/beats") + if err != nil { + return errors.Wrap(err, "error removing vendor dir") + } + + devtools.SetElasticBeatsDir(getAbsoluteBeatsPath()) + return setup.CopyVendor() +} + // returns a "compleated" config object with everything we need func getConfig() (map[string]string, error) { userCfg := make(map[string]string) diff --git a/go.mod b/go.mod index a666752561e6..0d3d2a66f254 100644 --- a/go.mod +++ b/go.mod @@ -190,5 +190,5 @@ replace ( github.com/google/gopacket => github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41 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 - golang.org/x/tools => golang.org/x/tools v0.0.0-20200615191743-991d59a616de // release 1.13 + golang.org/x/tools => golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0 // release 1.14 ) diff --git a/go.sum b/go.sum index 4b16629b1f5c..e93a0992230a 100644 --- a/go.sum +++ b/go.sum @@ -841,8 +841,9 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb 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-20200615191743-991d59a616de h1:kFKSx8iHlOzmtGWtfJW+b2UzcJ+rMWHHyUBpjrZq8To= -golang.org/x/tools v0.0.0-20200615191743-991d59a616de/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0 h1:6txNFSnY+tteYoO+hf01EpdYcYZiurdC9MDIrcUzEu4= +golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +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= From 7458eb6a318a7dc0ab360ffff3336dc530136636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 13:03:11 +0200 Subject: [PATCH 7/8] readd missing CopyVendor --- generator/common/beatgen/setup/setup.go | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index d30e06489c72..42098c40f4de 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -95,6 +95,42 @@ func copyReplacedModules() error { return w.Flush() } +// CopyVendor copies a new version of the dependencies to the vendor folder +func CopyVendor() error { + err := gotool.Mod.Vendor() + if err != nil { + return errors.Wrapf(err, "error while running go mod vendor") + } + + err = devtools.CopyFilesToVendor( + "./vendor", + []devtools.CopyModule{ + devtools.CopyModule{ + Name: "github.com/elastic/beats/v7", + FilesToCopy: []string{ + "dev-tools", + "libbeat", + "licenses", + "metricbeat", + "script", + ".go-version", + }, + }, + devtools.CopyModule{ + Name: "github.com/tsg/go-daemon", + FilesToCopy: []string{ + "src", + }, + }, + }, + ) + if err != nil { + return errors.Wrapf(err, "error while copying required files to vendor") + } + + return nil +} + // GitInit initializes a new git repo in the current directory func GitInit() error { return sh.Run("git", "init") From 8f97ccf6b193832042c772ad0a239c062773ff94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 9 Jul 2020 14:26:53 +0200 Subject: [PATCH 8/8] add missing packetbeat dockerfile --- packetbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 9a5e17eaa029..2711edfeeff1 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.10 +FROM golang:1.14.4 RUN \ apt-get update \