Skip to content

Commit

Permalink
Bump github.com/efficientgo/e2e from 0.11.1 to 0.12.1 (#322)
Browse files Browse the repository at this point in the history 
* Bump github.com/efficientgo/e2e from 0.11.1 to 0.12.1

Bumps [github.com/efficientgo/e2e](https://github.com/efficientgo/e2e) from 0.11.1 to 0.12.1.
- [Release notes](https://github.com/efficientgo/e2e/releases)
- [Commits](efficientgo/e2e@v0.11.1...v0.12.1)

---
updated-dependencies:
- dependency-name: github.com/efficientgo/e2e
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Adjust E2E test for module update

Signed-off-by: Matej Gera <matejgera@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matej Gera <matejgera@gmail.com>
  • Loading branch information
@dependabot @matej-g
dependabot[bot] and matej-g authored Jun 22, 2022
1 parent 69c5f26 commit 078b7ce
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 29 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/cloudflare/cfssl v1.6.1
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/deepmap/oapi-codegen v1.11.0
github.com/efficientgo/e2e v0.11.1
github.com/efficientgo/e2e v0.12.1
github.com/efficientgo/tools/core v0.0.0-20210731122119-5d4a0645ce9a
github.com/ghodss/yaml v1.0.0
github.com/go-chi/chi v4.1.2+incompatible
Expand Down
9 changes: 2 additions & 7 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
Expand Down Expand Up @@ -283,7 +282,6 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
Expand Down Expand Up @@ -358,8 +356,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/efficientgo/e2e v0.11.1 h1:zwF8qrZ+PaL7LyKx7jxL23bNoRzhyhO79Nd7t4swyzo=
github.com/efficientgo/e2e v0.11.1/go.mod h1:vDnF4AAEZmO0mvyFIATeDJPFaSRM7ywaOnKd61zaSoE=
github.com/efficientgo/e2e v0.12.1 h1:ZYNTf09ptlba0I3ZStYaF7gCbevWdalriiX7usOSiFM=
github.com/efficientgo/e2e v0.12.1/go.mod h1:xDHUyIqAWyVWU29Lf+BaZoavW7xAbDEvTwHWWI/3bhk=
github.com/efficientgo/tools/core v0.0.0-20210129205121-421d0828c9a6/go.mod h1:OmVcnJopJL8d3X3sSXTiypGoUSgFq1aDGmlrdi9dn/M=
github.com/efficientgo/tools/core v0.0.0-20210201224146-3d78f4d30648/go.mod h1:cFZoHUhKg31xkPnPjhPKFtevnx0Xcg67ptBRxbpaxtk=
github.com/efficientgo/tools/core v0.0.0-20210731122119-5d4a0645ce9a h1:Az9zRvQubUIHE+tHAm0gG7Dwge08V8Q/9uNSIFjFm+A=
Expand Down Expand Up @@ -410,7 +408,6 @@ github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897 h1:E52jfcE64UG42
github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4=
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
Expand Down Expand Up @@ -1127,7 +1124,6 @@ github.com/open-policy-agent/opa v0.39.0 h1:nus6g0UC4+6adN5GV2W7K/gsL9QoELBlv5iB
github.com/open-policy-agent/opa v0.39.0/go.mod h1:M+l9UHc2T3PCZ/RMPxiHNKZZhukiOWfmaSapx71TmGM=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
Expand Down Expand Up @@ -1381,7 +1377,6 @@ github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
Expand Down
41 changes: 20 additions & 21 deletions test/e2e/services.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func startServicesForRules(t *testing.T, e e2e.Environment) (metricsRulesEndpoin
"MINIO_KMS_KES_CERT_FILE=" + "root.cert",
"MINIO_KMS_KES_KEY_NAME=" + "my-minio-key",
}
f := e2e.NewInstrumentedRunnable(e, "rules-minio", ports, e2edb.AccessPortName)
f := e2e.NewInstrumentedRunnable(e, "rules-minio").WithPorts(ports, e2edb.AccessPortName)
runnable := f.Init(
e2e.StartOptions{
Image: "minio/minio:RELEASE.2022-03-03T21-21-16Z",
Expand All @@ -87,7 +87,7 @@ func startServicesForRules(t *testing.T, e e2e.Environment) (metricsRulesEndpoin
"curl -sSL --tlsv1.2 -O 'https://raw.githubusercontent.com/minio/kes/master/root.key' -O 'https://raw.githubusercontent.com/minio/kes/master/root.cert' && "+
"cp root.* /home/me/ && "+
"su - me -s /bin/sh -c 'mkdir -p %s && %s /opt/bin/minio server --address :%v --quiet %v'",
userID, f.InternalDir(), f.InternalDir(), filepath.Join(f.InternalDir(), bucket), strings.Join(envVars, " "), ports[e2edb.AccessPortName], f.InternalDir()),
userID, f.Future().InternalDir(), f.Future().InternalDir(), filepath.Join(f.Future().InternalDir(), bucket), strings.Join(envVars, " "), ports[e2edb.AccessPortName], f.Future().InternalDir()),
),
Readiness: e2e.NewHTTPReadinessProbe(e2edb.AccessPortName, "/minio/health/live", 200, 200),
},
Expand Down Expand Up @@ -151,7 +151,7 @@ func startServicesForTraces(t *testing.T, e e2e.Environment) (otlpGRPCEndpoint,

// startBaseServices starts and waits until all base services required for the test are ready.
func startBaseServices(t *testing.T, e e2e.Environment, tt testType) (
dex *e2e.InstrumentedRunnable,
dex e2e.InstrumentedRunnable,
token string,
rateLimiterAddr string,
) {
Expand All @@ -170,13 +170,13 @@ func startBaseServices(t *testing.T, e e2e.Environment, tt testType) (
return dex, token, gubernator.InternalEndpoint("grpc")
}

func newDexService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newDexService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{
"https": 5556,
"http-telemetry": 5558,
}

return e2e.NewInstrumentedRunnable(e, "dex", ports, "http-telemetry").Init(
return e2e.NewInstrumentedRunnable(e, "dex").WithPorts(ports, "http-telemetry").Init(
e2e.StartOptions{
Image: dexImage,
Command: e2e.NewCommand("dex", "serve", filepath.Join(configsContainerPath, "dex.yaml")),
Expand All @@ -192,13 +192,13 @@ func newDexService(e e2e.Environment) *e2e.InstrumentedRunnable {
)
}

func newGubernatorService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newGubernatorService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{
"http": 8880,
"grpc": 8881,
}

return e2e.NewInstrumentedRunnable(e, "gubernator", ports, "http").Init(
return e2e.NewInstrumentedRunnable(e, "gubernator").WithPorts(ports, "http").Init(
e2e.StartOptions{
Image: gubernatorImage,
EnvVars: map[string]string{
Expand All @@ -213,7 +213,7 @@ func newGubernatorService(e e2e.Environment) *e2e.InstrumentedRunnable {
)
}

func newThanosReceiveService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newThanosReceiveService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{
"http": 10902,
"grpc": 10901,
Expand All @@ -232,7 +232,7 @@ func newThanosReceiveService(e e2e.Environment) *e2e.InstrumentedRunnable {
"--tsdb.path": "/tmp",
})

return e2e.NewInstrumentedRunnable(e, "thanos-receive", ports, "http").Init(
return e2e.NewInstrumentedRunnable(e, "thanos-receive").WithPorts(ports, "http").Init(
e2e.StartOptions{
Image: thanosImage,
Command: e2e.NewCommand("receive", args...),
Expand All @@ -242,7 +242,7 @@ func newThanosReceiveService(e e2e.Environment) *e2e.InstrumentedRunnable {
)
}

func newLokiService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newLokiService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{"http": 3100}

args := e2e.BuildArgs(map[string]string{
Expand All @@ -251,7 +251,7 @@ func newLokiService(e e2e.Environment) *e2e.InstrumentedRunnable {
"-log.level": logLevelError,
})

return e2e.NewInstrumentedRunnable(e, "loki", ports, "http").Init(
return e2e.NewInstrumentedRunnable(e, "loki").WithPorts(ports, "http").Init(
e2e.StartOptions{
Image: lokiImage,
Command: e2e.NewCommandWithoutEntrypoint("loki", args...),
Expand All @@ -264,7 +264,7 @@ func newLokiService(e e2e.Environment) *e2e.InstrumentedRunnable {
)
}

func newRulesBackendService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newRulesBackendService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{"http": 8080, "internal": 8081}

args := e2e.BuildArgs(map[string]string{
Expand All @@ -275,7 +275,7 @@ func newRulesBackendService(e e2e.Environment) *e2e.InstrumentedRunnable {
"--objstore.config-file": filepath.Join(configsContainerPath, "rules-objstore.yaml"),
})

return e2e.NewInstrumentedRunnable(e, "rules_objstore", ports, "internal").Init(
return e2e.NewInstrumentedRunnable(e, "rules_objstore").WithPorts(ports, "internal").Init(
e2e.StartOptions{
Image: rulesObjectStoreImage,
Command: e2e.NewCommand("", args...),
Expand All @@ -285,7 +285,7 @@ func newRulesBackendService(e e2e.Environment) *e2e.InstrumentedRunnable {
)
}

func newOPAService(e e2e.Environment) *e2e.InstrumentedRunnable {
func newOPAService(e e2e.Environment) e2e.InstrumentedRunnable {
ports := map[string]int{"http": 8181}

args := e2e.BuildArgs(map[string]string{
Expand All @@ -294,7 +294,7 @@ func newOPAService(e e2e.Environment) *e2e.InstrumentedRunnable {
"--ignore": "*.json",
})

return e2e.NewInstrumentedRunnable(e, "opa", ports, "http").Init(
return e2e.NewInstrumentedRunnable(e, "opa").WithPorts(ports, "http").Init(
e2e.StartOptions{
Image: opaImage,
Command: e2e.NewCommand("run", args...),
Expand Down Expand Up @@ -372,7 +372,7 @@ func withRateLimiter(addr string) apiOption {
func newObservatoriumAPIService(
e e2e.Environment,
options ...apiOption,
) (*e2e.InstrumentedRunnable, error) {
) (e2e.InstrumentedRunnable, error) {
opts := apiOptions{}
for _, o := range options {
o(&opts)
Expand Down Expand Up @@ -440,14 +440,13 @@ func newObservatoriumAPIService(
args = append(args, "--grpc.listen="+opts.gRPCListenEndpoint)
}

return e2e.NewInstrumentedRunnable(e, "observatorium_api", ports, "http-internal").Init(
return e2e.NewInstrumentedRunnable(e, "observatorium_api").WithPorts(ports, "http-internal").Init(
e2e.StartOptions{
Image: apiImage,
Command: e2e.NewCommandWithoutEntrypoint("observatorium-api", args...),
Readiness: e2e.NewHTTPReadinessProbe("http-internal", "/ready", 200, 200),
User: strconv.Itoa(os.Getuid()),
},
), nil
}), nil
}

type runParams struct {
Expand Down Expand Up @@ -483,7 +482,7 @@ func newUpRun(
tt testType,
readEndpoint, writeEndpoint string,
options ...upOption,
) (*e2e.InstrumentedRunnable, error) {
) (e2e.InstrumentedRunnable, error) {
opts := upOptions{}
for _, o := range options {
o(&opts)
Expand Down Expand Up @@ -533,7 +532,7 @@ func newUpRun(
}
}

return e2e.NewInstrumentedRunnable(env, name, ports, "http").Init(
return e2e.NewInstrumentedRunnable(env, name).WithPorts(ports, "http").Init(
e2e.StartOptions{
Image: upImage,
Command: e2e.NewCommandWithoutEntrypoint("up", args...),
Expand Down

0 comments on commit 078b7ce

Please sign in to comment.