Skip to content

Commit 79ebe29

Browse files
CMGSCMGS
committed
upgrade to 1.18
1 parent 43d7381 commit 79ebe29

File tree

18 files changed

+757
-65
lines changed

18 files changed

+757
-65
lines changed

‎.github/workflows/golangci-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
2727
with:
2828
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
29-
version: v1.45.0
29+
version: latest
3030
# Optional: show only new issues if it's a pull request. The default value is `false`.
3131
only-new-issues: true

‎3rdmocks/ServerStream.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Eru can use multiple engines to run anything for the long or short term.
1010

1111
This project is Eru Core. The Core use for resource allocation and manage resource's lifetime.
1212

13+
Suggest use go 1.18 and above.
14+
1315
### Testing
1416

1517
Run ` make test `

‎client/utils/servicepusher.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/cornelk/hashmap"
1212
"github.com/go-ping/ping"
1313
"github.com/projecteru2/core/log"
14+
"golang.org/x/exp/slices"
1415
)
1516

1617
// EndpointPusher pushes endpoints to registered channels if the ep is L3 reachable
@@ -40,10 +41,6 @@ func (p *EndpointPusher) Push(endpoints []string) {
4041
func (p *EndpointPusher) delOutdated(endpoints []string) {
4142
p.Lock()
4243
defer p.Unlock()
43-
newEndpoints := make(map[string]struct{}) // TODO after go 1.18, use slice package to search endpoints
44-
for _, endpoint := range endpoints {
45-
newEndpoints[endpoint] = struct{}{}
46-
}
4744

4845
for kv := range p.pendingEndpoints.Iter() {
4946
endpoint, ok := kv.Key.(string)
@@ -55,7 +52,7 @@ func (p *EndpointPusher) delOutdated(endpoints []string) {
5552
if !ok {
5653
log.Error("[EruResolver] failed to cast value while ranging pendingEndpoints")
5754
}
58-
if _, ok := newEndpoints[endpoint]; !ok {
55+
if !slices.Contains(endpoints, endpoint) {
5956
cancel()
6057
p.pendingEndpoints.Del(endpoint)
6158
log.Debugf(nil, "[EruResolver] pending endpoint deleted: %s", endpoint) //nolint
@@ -68,7 +65,7 @@ func (p *EndpointPusher) delOutdated(endpoints []string) {
6865
log.Error("[EruResolver] failed to cast key while ranging availableEndpoints")
6966
continue
7067
}
71-
if _, ok := newEndpoints[endpoint]; !ok {
68+
if !slices.Contains(endpoints, endpoint) {
7269
p.availableEndpoints.Del(endpoint)
7370
log.Debugf(nil, "[EruResolver] available endpoint deleted: %s", endpoint) //nolint
7471
}

‎cluster/mocks/Cluster.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/docker/mocks/APIClient.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/mocks/API.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+43-39
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,80 @@ module github.com/projecteru2/core
22

33
go 1.18
44

5+
require (
6+
github.com/CMGS/statsd v0.0.0-20160223095033-48c421b3c1ab
7+
github.com/alicebob/miniredis/v2 v2.14.3
8+
github.com/cenkalti/backoff/v4 v4.0.2
9+
github.com/cornelk/hashmap v1.0.2-0.20210201213917-c93d96ce6b8a
10+
github.com/docker/distribution v2.8.0+incompatible
11+
github.com/docker/docker v20.10.0+incompatible
12+
github.com/docker/go-connections v0.4.0
13+
github.com/docker/go-units v0.4.0
14+
github.com/getsentry/sentry-go v0.9.0
15+
github.com/go-git/go-git/v5 v5.2.0
16+
github.com/go-ping/ping v0.0.0-20210407214646-e4e642a95741
17+
github.com/go-redis/redis/v8 v8.8.2
18+
github.com/google/uuid v1.1.2
19+
github.com/jinzhu/configor v1.2.0
20+
github.com/muroq/redislock v0.0.0-20210327061935-5425e33e6f9f
21+
github.com/opencontainers/image-spec v1.0.2
22+
github.com/patrickmn/go-cache v2.1.0+incompatible
23+
github.com/pkg/errors v0.9.1
24+
github.com/projecteru2/libyavirt v0.0.0-20220112061300-ac7002c411ff
25+
github.com/prometheus/client_golang v1.11.0
26+
github.com/sanity-io/litter v1.5.1
27+
github.com/sirupsen/logrus v1.8.1
28+
github.com/stretchr/testify v1.7.0
29+
github.com/urfave/cli/v2 v2.2.0
30+
go.etcd.io/bbolt v1.3.6
31+
go.etcd.io/etcd/api/v3 v3.5.0
32+
go.etcd.io/etcd/client/pkg/v3 v3.5.0
33+
go.etcd.io/etcd/client/v3 v3.5.0
34+
go.etcd.io/etcd/tests/v3 v3.5.0
35+
go.uber.org/automaxprocs v1.3.0
36+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
37+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
38+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
39+
google.golang.org/grpc v1.40.0
40+
google.golang.org/protobuf v1.27.1
41+
)
42+
543
require (
644
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
745
github.com/BurntSushi/toml v0.3.1 // indirect
8-
github.com/CMGS/statsd v0.0.0-20160223095033-48c421b3c1ab
946
github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331 // indirect
1047
github.com/Microsoft/hcsshim v0.8.11 // indirect
1148
github.com/alexcesaro/statsd v2.0.0+incompatible // indirect
1249
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
13-
github.com/alicebob/miniredis/v2 v2.14.3
1450
github.com/beorn7/perks v1.0.1 // indirect
15-
github.com/cenkalti/backoff/v4 v4.0.2
1651
github.com/cespare/xxhash/v2 v2.1.1 // indirect
1752
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
1853
github.com/containerd/containerd v1.4.13 // indirect
1954
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe // indirect
2055
github.com/coreos/go-semver v0.3.0 // indirect
2156
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
22-
github.com/cornelk/hashmap v1.0.2-0.20210201213917-c93d96ce6b8a
2357
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
2458
github.com/davecgh/go-spew v1.1.1 // indirect
2559
github.com/dchest/siphash v1.1.0 // indirect
2660
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
27-
github.com/docker/distribution v2.8.0+incompatible
28-
github.com/docker/docker v20.10.0+incompatible
29-
github.com/docker/go-connections v0.4.0
3061
github.com/docker/go-metrics v0.0.1 // indirect
31-
github.com/docker/go-units v0.4.0
3262
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
3363
github.com/dustin/go-humanize v1.0.0 // indirect
3464
github.com/emirpasic/gods v1.12.0 // indirect
3565
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
36-
github.com/getsentry/sentry-go v0.9.0
3766
github.com/go-git/gcfg v1.5.0 // indirect
3867
github.com/go-git/go-billy/v5 v5.0.0 // indirect
39-
github.com/go-git/go-git/v5 v5.2.0
40-
github.com/go-ping/ping v0.0.0-20210407214646-e4e642a95741
41-
github.com/go-redis/redis/v8 v8.8.2
4268
github.com/gogo/protobuf v1.3.2 // indirect
4369
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4470
github.com/golang/protobuf v1.5.2 // indirect
4571
github.com/google/btree v1.0.1 // indirect
46-
github.com/google/uuid v1.1.2
4772
github.com/gorilla/mux v1.7.4 // indirect
4873
github.com/gorilla/websocket v1.4.2 // indirect
4974
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
5075
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5176
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
5277
github.com/imdario/mergo v0.3.9 // indirect
5378
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
54-
github.com/jinzhu/configor v1.2.0
5579
github.com/jonboulle/clockwork v0.2.2 // indirect
5680
github.com/json-iterator/go v1.1.11 // indirect
5781
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
@@ -63,41 +87,26 @@ require (
6387
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6488
github.com/modern-go/reflect2 v1.0.1 // indirect
6589
github.com/morikuni/aec v1.0.0 // indirect
66-
github.com/muroq/redislock v0.0.0-20210327061935-5425e33e6f9f
6790
github.com/opencontainers/go-digest v1.0.0 // indirect
68-
github.com/opencontainers/image-spec v1.0.2
6991
github.com/opencontainers/runc v1.0.3 // indirect
70-
github.com/patrickmn/go-cache v2.1.0+incompatible
71-
github.com/pkg/errors v0.9.1
7292
github.com/pmezard/go-difflib v1.0.0 // indirect
73-
github.com/projecteru2/libyavirt v0.0.0-20220112061300-ac7002c411ff
74-
github.com/prometheus/client_golang v1.11.0
7593
github.com/prometheus/client_model v0.2.0 // indirect
7694
github.com/prometheus/common v0.26.0 // indirect
7795
github.com/prometheus/procfs v0.6.0 // indirect
7896
github.com/russross/blackfriday/v2 v2.0.1 // indirect
79-
github.com/sanity-io/litter v1.5.1
8097
github.com/sergi/go-diff v1.1.0 // indirect
8198
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
82-
github.com/sirupsen/logrus v1.8.1
8399
github.com/soheilhy/cmux v0.1.5 // indirect
84100
github.com/spf13/pflag v1.0.5 // indirect
85101
github.com/stretchr/objx v0.1.1 // indirect
86-
github.com/stretchr/testify v1.7.0
87102
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
88-
github.com/urfave/cli/v2 v2.2.0
89103
github.com/xanzy/ssh-agent v0.2.1 // indirect
90104
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
91105
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
92-
go.etcd.io/bbolt v1.3.6
93-
go.etcd.io/etcd/api/v3 v3.5.0
94-
go.etcd.io/etcd/client/pkg/v3 v3.5.0
95106
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
96-
go.etcd.io/etcd/client/v3 v3.5.0
97107
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
98108
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
99109
go.etcd.io/etcd/server/v3 v3.5.0 // indirect
100-
go.etcd.io/etcd/tests/v3 v3.5.0
101110
go.opencensus.io v0.22.1 // indirect
102111
go.opentelemetry.io/contrib v0.20.0 // indirect
103112
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
@@ -110,23 +119,18 @@ require (
110119
go.opentelemetry.io/otel/trace v0.20.0 // indirect
111120
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
112121
go.uber.org/atomic v1.7.0 // indirect
113-
go.uber.org/automaxprocs v1.3.0
114122
go.uber.org/multierr v1.6.0 // indirect
115123
go.uber.org/zap v1.17.0 // indirect
116-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
124+
golang.org/x/exp v0.0.0-20220323204016-c86f0da35e87 // indirect
117125
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
118-
golang.org/x/mod v0.4.2 // indirect
119-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
120-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
121-
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
122-
golang.org/x/text v0.3.5 // indirect
126+
golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
127+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
128+
golang.org/x/text v0.3.7 // indirect
123129
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
124-
golang.org/x/tools v0.1.2 // indirect
130+
golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect
125131
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
126132
google.golang.org/appengine v1.6.3 // indirect
127133
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
128-
google.golang.org/grpc v1.40.0
129-
google.golang.org/protobuf v1.27.1
130134
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
131135
gopkg.in/warnings.v0 v0.1.2 // indirect
132136
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)