Skip to content

Commit a0e6108

Browse files
cmacknzAndersonQ
andauthored
Filter binaries by platform when EXTERNAL=true (#1908)
* Filter binaries by platform when EXTERNAL=true Not all binaries are available for every platform, and if we try to download a binary from an artifact URL that doesn't exist the build fails. * Update e2e-testing/downloads, handle download errs. Rather than panicing when we attempt to download an artifact on an unsupported platform, we ignore the error and log that we are skipping the download. * Remove beats dependency. * Remove redundant word from log Co-authored-by: Anderson Queiroz <me@andersonq.me> Co-authored-by: Anderson Queiroz <me@andersonq.me>
1 parent 5e2e190 commit a0e6108

File tree

5 files changed

+300
-142
lines changed

5 files changed

+300
-142
lines changed

NOTICE.txt

+134-44
Original file line numberDiff line numberDiff line change
@@ -816,15 +816,105 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
816816

817817
--------------------------------------------------------------------------------
818818
Dependency : github.com/elastic/e2e-testing
819-
Version: v1.99.2-0.20220117192005-d3365c99b9c4
819+
Version: v1.99.2-0.20221205111528-ade3c840d0c0
820820
Licence type (autodetected): Elastic
821821
--------------------------------------------------------------------------------
822822

823-
Contents of probable licence file $GOMODCACHE/github.com/elastic/e2e-testing@v1.99.2-0.20220117192005-d3365c99b9c4/cli/LICENSE.txt:
823+
Contents of probable licence file $GOMODCACHE/github.com/elastic/e2e-testing@v1.99.2-0.20221205111528-ade3c840d0c0/LICENSE.txt:
824824

825-
Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
826-
or more contributor license agreements. Licensed under the Elastic License;
827-
you may not use this file except in compliance with the Elastic License.
825+
Elastic License 2.0
826+
827+
URL: https://www.elastic.co/licensing/elastic-license
828+
829+
## Acceptance
830+
831+
By using the software, you agree to all of the terms and conditions below.
832+
833+
## Copyright License
834+
835+
The licensor grants you a non-exclusive, royalty-free, worldwide,
836+
non-sublicensable, non-transferable license to use, copy, distribute, make
837+
available, and prepare derivative works of the software, in each case subject to
838+
the limitations and conditions below.
839+
840+
## Limitations
841+
842+
You may not provide the software to third parties as a hosted or managed
843+
service, where the service provides users with access to any substantial set of
844+
the features or functionality of the software.
845+
846+
You may not move, change, disable, or circumvent the license key functionality
847+
in the software, and you may not remove or obscure any functionality in the
848+
software that is protected by the license key.
849+
850+
You may not alter, remove, or obscure any licensing, copyright, or other notices
851+
of the licensor in the software. Any use of the licensor’s trademarks is subject
852+
to applicable law.
853+
854+
## Patents
855+
856+
The licensor grants you a license, under any patent claims the licensor can
857+
license, or becomes able to license, to make, have made, use, sell, offer for
858+
sale, import and have imported the software, in each case subject to the
859+
limitations and conditions in this license. This license does not cover any
860+
patent claims that you cause to be infringed by modifications or additions to
861+
the software. If you or your company make any written claim that the software
862+
infringes or contributes to infringement of any patent, your patent license for
863+
the software granted under these terms ends immediately. If your company makes
864+
such a claim, your patent license ends immediately for work on behalf of your
865+
company.
866+
867+
## Notices
868+
869+
You must ensure that anyone who gets a copy of any part of the software from you
870+
also gets a copy of these terms.
871+
872+
If you modify the software, you must include in any modified copies of the
873+
software prominent notices stating that you have modified the software.
874+
875+
## No Other Rights
876+
877+
These terms do not imply any licenses other than those expressly granted in
878+
these terms.
879+
880+
## Termination
881+
882+
If you use the software in violation of these terms, such use is not licensed,
883+
and your licenses will automatically terminate. If the licensor provides you
884+
with a notice of your violation, and you cease all violation of this license no
885+
later than 30 days after you receive that notice, your licenses will be
886+
reinstated retroactively. However, if you violate these terms after such
887+
reinstatement, any additional violation of these terms will cause your licenses
888+
to terminate automatically and permanently.
889+
890+
## No Liability
891+
892+
*As far as the law allows, the software comes as is, without any warranty or
893+
condition, and the licensor will not be liable to you for any damages arising
894+
out of these terms or the use or nature of the software, under any kind of
895+
legal claim.*
896+
897+
## Definitions
898+
899+
The **licensor** is the entity offering these terms, and the **software** is the
900+
software the licensor makes available under these terms, including any portion
901+
of it.
902+
903+
**you** refers to the individual or entity agreeing to these terms.
904+
905+
**your company** is any legal entity, sole proprietorship, or other kind of
906+
organization that you work for, plus all organizations that have control over,
907+
are under the control of, or are under common control with that
908+
organization. **control** means ownership of substantially all the assets of an
909+
entity, or the power to direct its management and policies by vote, contract, or
910+
otherwise. Control can be direct or indirect.
911+
912+
**your licenses** are all the licenses granted to you for the software under
913+
these terms.
914+
915+
**use** means anything you do with the software requiring one of your licenses.
916+
917+
**trademark** means trademarks, service marks, and similar rights.
828918

829919

830920
--------------------------------------------------------------------------------
@@ -3992,6 +4082,37 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39924082
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
39934083
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39944084

4085+
--------------------------------------------------------------------------------
4086+
Dependency : github.com/sirupsen/logrus
4087+
Version: v1.8.1
4088+
Licence type (autodetected): MIT
4089+
--------------------------------------------------------------------------------
4090+
4091+
Contents of probable licence file $GOMODCACHE/github.com/sirupsen/logrus@v1.8.1/LICENSE:
4092+
4093+
The MIT License (MIT)
4094+
4095+
Copyright (c) 2014 Simon Eskildsen
4096+
4097+
Permission is hereby granted, free of charge, to any person obtaining a copy
4098+
of this software and associated documentation files (the "Software"), to deal
4099+
in the Software without restriction, including without limitation the rights
4100+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
4101+
copies of the Software, and to permit persons to whom the Software is
4102+
furnished to do so, subject to the following conditions:
4103+
4104+
The above copyright notice and this permission notice shall be included in
4105+
all copies or substantial portions of the Software.
4106+
4107+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
4108+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
4109+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
4110+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
4111+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
4112+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
4113+
THE SOFTWARE.
4114+
4115+
39954116
--------------------------------------------------------------------------------
39964117
Dependency : github.com/spf13/cobra
39974118
Version: v1.3.0
@@ -5331,11 +5452,11 @@ THE SOFTWARE.
53315452

53325453
--------------------------------------------------------------------------------
53335454
Dependency : golang.org/x/crypto
5334-
Version: v0.0.0-20210817164053-32db794688a5
5455+
Version: v0.0.0-20211117183948-ae814b36b871
53355456
Licence type (autodetected): BSD-3-Clause
53365457
--------------------------------------------------------------------------------
53375458

5338-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20210817164053-32db794688a5/LICENSE:
5459+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20211117183948-ae814b36b871/LICENSE:
53395460

53405461
Copyright (c) 2009 The Go Authors. All rights reserved.
53415462

@@ -7218,11 +7339,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
72187339

72197340
--------------------------------------------------------------------------------
72207341
Dependency : github.com/cenkalti/backoff/v4
7221-
Version: v4.1.1
7342+
Version: v4.1.2
72227343
Licence type (autodetected): MIT
72237344
--------------------------------------------------------------------------------
72247345

7225-
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.1.1/LICENSE:
7346+
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.1.2/LICENSE:
72267347

72277348
The MIT License (MIT)
72287349

@@ -12324,11 +12445,11 @@ Contents of probable licence file $GOMODCACHE/github.com/moby/spdystream@v0.2.0/
1232412445

1232512446
--------------------------------------------------------------------------------
1232612447
Dependency : github.com/moby/term
12327-
Version: v0.0.0-20210610120745-9d4ed1856297
12448+
Version: v0.0.0-20210619224110-3f7ff695adc6
1232812449
Licence type (autodetected): Apache-2.0
1232912450
--------------------------------------------------------------------------------
1233012451

12331-
Contents of probable licence file $GOMODCACHE/github.com/moby/term@v0.0.0-20210610120745-9d4ed1856297/LICENSE:
12452+
Contents of probable licence file $GOMODCACHE/github.com/moby/term@v0.0.0-20210619224110-3f7ff695adc6/LICENSE:
1233212453

1233312454

1233412455
Apache License
@@ -13834,37 +13955,6 @@ DEALINGS IN THE SOFTWARE.
1383413955

1383513956

1383613957

13837-
--------------------------------------------------------------------------------
13838-
Dependency : github.com/sirupsen/logrus
13839-
Version: v1.8.1
13840-
Licence type (autodetected): MIT
13841-
--------------------------------------------------------------------------------
13842-
13843-
Contents of probable licence file $GOMODCACHE/github.com/sirupsen/logrus@v1.8.1/LICENSE:
13844-
13845-
The MIT License (MIT)
13846-
13847-
Copyright (c) 2014 Simon Eskildsen
13848-
13849-
Permission is hereby granted, free of charge, to any person obtaining a copy
13850-
of this software and associated documentation files (the "Software"), to deal
13851-
in the Software without restriction, including without limitation the rights
13852-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13853-
copies of the Software, and to permit persons to whom the Software is
13854-
furnished to do so, subject to the following conditions:
13855-
13856-
The above copyright notice and this permission notice shall be included in
13857-
all copies or substantial portions of the Software.
13858-
13859-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13860-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13861-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
13862-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
13863-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
13864-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13865-
THE SOFTWARE.
13866-
13867-
1386813958
--------------------------------------------------------------------------------
1386913959
Dependency : github.com/spf13/afero
1387013960
Version: v1.6.0
@@ -17399,11 +17489,11 @@ Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/
1739917489

1740017490
--------------------------------------------------------------------------------
1740117491
Dependency : sigs.k8s.io/yaml
17402-
Version: v1.2.0
17492+
Version: v1.3.0
1740317493
Licence type (autodetected): MIT
1740417494
--------------------------------------------------------------------------------
1740517495

17406-
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/yaml@v1.2.0/LICENSE:
17496+
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/yaml@v1.3.0/LICENSE:
1740717497

1740817498
The MIT License (MIT)
1740917499

dev-tools/mage/platforms.go

+8
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,14 @@ func (list BuildPlatformList) Get(name string) (BuildPlatform, bool) {
200200
return BuildPlatform{}, false
201201
}
202202

203+
func (list BuildPlatformList) Names() []string {
204+
platforms := make([]string, len(list))
205+
for i, bp := range list {
206+
platforms[i] = bp.Name
207+
}
208+
return platforms
209+
}
210+
203211
// Defaults returns the default platforms contained in the list.
204212
func (list BuildPlatformList) Defaults() BuildPlatformList {
205213
return list.filter(func(p BuildPlatform) bool {

go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534
1212
github.com/docker/go-units v0.4.0
1313
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
14-
github.com/elastic/e2e-testing v1.99.2-0.20220117192005-d3365c99b9c4
14+
github.com/elastic/e2e-testing v1.99.2-0.20221205111528-ade3c840d0c0
1515
github.com/elastic/elastic-agent-autodiscover v0.2.1
1616
github.com/elastic/elastic-agent-client/v7 v7.0.2-0.20221129150247-15881a8e64ef
1717
github.com/elastic/elastic-agent-libs v0.2.15
@@ -38,14 +38,15 @@ require (
3838
github.com/pkg/errors v0.9.1
3939
github.com/rs/zerolog v1.27.0
4040
github.com/shirou/gopsutil/v3 v3.21.12
41+
github.com/sirupsen/logrus v1.8.1
4142
github.com/spf13/cobra v1.3.0
4243
github.com/stretchr/testify v1.7.0
4344
github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b
4445
go.elastic.co/apm/module/apmgorilla v1.15.0
4546
go.elastic.co/ecszap v1.0.1
4647
go.elastic.co/go-licence-detector v0.5.0
4748
go.uber.org/zap v1.21.0
48-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
49+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
4950
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
5051
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
5152
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
@@ -65,7 +66,7 @@ require (
6566
github.com/akavel/rsrc v0.8.0 // indirect
6667
github.com/armon/go-radix v1.0.0 // indirect
6768
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
68-
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
69+
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
6970
github.com/containerd/containerd v1.5.13 // indirect
7071
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
7172
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -111,7 +112,6 @@ require (
111112
github.com/prometheus/procfs v0.7.3 // indirect
112113
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
113114
github.com/sergi/go-diff v1.1.0 // indirect
114-
github.com/sirupsen/logrus v1.8.1 // indirect
115115
github.com/spf13/pflag v1.0.5 // indirect
116116
github.com/stretchr/objx v0.2.0 // indirect
117117
github.com/tklauser/go-sysconf v0.3.9 // indirect
@@ -140,7 +140,7 @@ require (
140140
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
141141
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
142142
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
143-
sigs.k8s.io/yaml v1.2.0 // indirect
143+
sigs.k8s.io/yaml v1.3.0 // indirect
144144
)
145145

146146
require (

0 commit comments

Comments
 (0)