Skip to content

Commit d53ce1e

Browse files
authored
chore: upgrade go version, dependencies and speed up image build (#192)
* upgrade to go 1.17 * get rid of vendor * speed up image build by caching mods
1 parent ce24b29 commit d53ce1e

File tree

1,523 files changed

+277
-679013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,523 files changed

+277
-679013
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ROOT := $(shell pwd)
1515

1616
all: local-build
1717

18-
GO_VERSION := 1.15
18+
GO_VERSION := 1.17
1919
SCRIPT_PATH := $(ROOT)/scripts/:${PATH}
2020
SOURCES := $(shell find . -name '*.go')
2121
BINARY_NAME := local-container-endpoints
@@ -86,11 +86,11 @@ publish-dockerhub:
8686

8787
.PHONY: test
8888
test:
89-
go test -mod=vendor -timeout=120s -v -cover ./local-container-endpoints/...
89+
go test -timeout=120s -v -cover ./local-container-endpoints/...
9090

9191
.PHONY: functional-test
9292
functional-test:
93-
go test -mod=vendor -timeout=120s -v -tags functional -cover ./local-container-endpoints/handlers/functional_tests/...
93+
go test -timeout=120s -v -tags functional -cover ./local-container-endpoints/handlers/functional_tests/...
9494

9595
.PHONY: integ
9696
integ: build-local-image

go.mod

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,63 @@
11
module github.com/awslabs/amazon-ecs-local-container-endpoints
22

3-
go 1.15
3+
go 1.17
44

55
require (
6-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
7-
github.com/Microsoft/go-winio v0.4.12 // indirect
8-
github.com/aws/amazon-ecs-agent v1.26.0
6+
github.com/aws/amazon-ecs-agent/agent v0.0.0-20221019221528-5fb8e801e9d1
97
github.com/aws/aws-sdk-go v1.37.10
8+
github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94
9+
github.com/fatih/structs v1.1.0
10+
github.com/golang/mock v1.2.0
11+
github.com/gorilla/mux v1.8.0
12+
github.com/peterbourgon/mergemap v0.0.0-20130613134717-e21c03b7a721
13+
github.com/pkg/errors v0.9.1
14+
github.com/sirupsen/logrus v1.8.1
15+
github.com/stretchr/testify v1.7.0
16+
)
17+
18+
require (
19+
github.com/Microsoft/go-winio v0.4.12 // indirect
20+
github.com/awslabs/go-config-generator-for-fluentd-and-fluentbit v0.0.0-20190829210224-55d4fd2e6f35 // indirect
21+
github.com/beorn7/perks v1.0.0 // indirect
1022
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
11-
github.com/containerd/cgroups v0.0.0-20190226200435-dbea6f2bd416 // indirect
12-
github.com/containernetworking/cni v0.6.0 // indirect
13-
github.com/coreos/go-systemd v0.0.0-20190212144455-93d5ec2c7f76 // indirect
23+
github.com/cilium/ebpf v0.4.0 // indirect
24+
github.com/containerd/cgroups v1.0.4-0.20220221221032-e710ed6ebb1a // indirect
25+
github.com/containerd/containerd v1.4.13 // indirect
26+
github.com/containernetworking/cni v0.8.1 // indirect
27+
github.com/containernetworking/plugins v0.8.6 // indirect
28+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
29+
github.com/davecgh/go-spew v1.1.1 // indirect
1430
github.com/docker/distribution v2.7.1+incompatible // indirect
15-
github.com/docker/docker v0.7.3-0.20190309235953-33c3200e0d16
1631
github.com/docker/go-connections v0.4.0 // indirect
17-
github.com/docker/go-units v0.3.3 // indirect
18-
github.com/fatih/structs v1.1.0
19-
github.com/godbus/dbus v0.0.0-20190305164336-85c147412614 // indirect
32+
github.com/docker/go-units v0.4.0 // indirect
33+
github.com/fsnotify/fsnotify v1.5.4 // indirect
34+
github.com/godbus/dbus/v5 v5.0.6 // indirect
2035
github.com/gogo/protobuf v1.3.2 // indirect
21-
github.com/golang/mock v1.2.0
22-
github.com/google/go-cmp v0.2.0 // indirect
23-
github.com/gorilla/mux v1.7.0
24-
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
36+
github.com/golang/protobuf v1.5.0 // indirect
37+
github.com/google/uuid v1.1.2 // indirect
38+
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
39+
github.com/jmespath/go-jmespath v0.4.0 // indirect
40+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
2541
github.com/onsi/ginkgo v1.8.0 // indirect
2642
github.com/onsi/gomega v1.5.0 // indirect
2743
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
28-
github.com/opencontainers/image-spec v1.0.1 // indirect
29-
github.com/opencontainers/runtime-spec v0.1.2-0.20190305201733-197975d695ce // indirect
44+
github.com/opencontainers/image-spec v1.0.2 // indirect
45+
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
3046
github.com/pborman/uuid v1.2.0 // indirect
31-
github.com/peterbourgon/mergemap v0.0.0-20130613134717-e21c03b7a721
32-
github.com/pkg/errors v0.9.1
33-
github.com/prometheus/client_golang v0.9.2 // indirect
34-
github.com/sirupsen/logrus v1.3.0
35-
github.com/stretchr/testify v1.2.2
47+
github.com/pmezard/go-difflib v1.0.0 // indirect
48+
github.com/prometheus/client_golang v0.9.4 // indirect
49+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
50+
github.com/prometheus/common v0.4.1 // indirect
51+
github.com/prometheus/procfs v0.6.0 // indirect
52+
github.com/vishvananda/netlink v1.1.0 // indirect
53+
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
54+
go.etcd.io/bbolt v1.3.6 // indirect
55+
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
56+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
57+
golang.org/x/text v0.3.6 // indirect
3658
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
37-
google.golang.org/grpc v1.19.1 // indirect
38-
gotest.tools v2.2.0+incompatible // indirect
59+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
60+
google.golang.org/grpc v1.38.0 // indirect
61+
google.golang.org/protobuf v1.27.1 // indirect
62+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
3963
)

0 commit comments

Comments
 (0)