Skip to content

Commit 5557b33

Browse files
authored
Upgrade aws-sdk-go to v1.44.184 (#2992)
1 parent d9c2a77 commit 5557b33

File tree

5 files changed

+1927
-192
lines changed

5 files changed

+1927
-192
lines changed

Makefile

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ helm-lint:
6464
${MAKEFILE_PATH}/test/helm/helm-lint.sh
6565

6666
# Generate code
67-
generate: aws-sdk-model-override controller-gen
67+
generate: aws-sdk-model-override controller-gen mockgen
6868
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
69+
MOCKGEN=$(MOCKGEN) ./scripts/gen_mocks.sh
6970

7071
aws-sdk-model-override:
7172
@if [ "$(AWS_SDK_MODEL_OVERRIDE)" = "y" ] ; then \
@@ -99,6 +100,24 @@ else
99100
CONTROLLER_GEN=$(shell which controller-gen)
100101
endif
101102

103+
# find or download mockgen
104+
# download mockgen if necessary
105+
.PHONY: mockgen
106+
mockgen:
107+
ifeq (, $(shell which mockgen))
108+
@{ \
109+
set -e ;\
110+
MOCKGEN_TMP_DIR=$$(mktemp -d) ;\
111+
cd $$MOCKGEN_TMP_DIR ;\
112+
go mod init tmp ;\
113+
go install github.com/golang/mock/[email protected] ;\
114+
rm -rf $$MOCKGEN_TMP_DIR ;\
115+
}
116+
MOCKGEN=$(GOBIN)/mockgen
117+
else
118+
MOCKGEN=$(shell which mockgen)
119+
endif
120+
102121
# install kustomize if not found
103122
kustomize:
104123
ifeq (, $(shell which kustomize))

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module sigs.k8s.io/aws-load-balancer-controller
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.137
6+
github.com/aws/aws-sdk-go v1.44.184
77
github.com/gavv/httpexpect/v2 v2.3.1
88
github.com/go-logr/logr v0.4.0
99
github.com/golang/mock v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:o
9696
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
9797
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
9898
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
99-
github.com/aws/aws-sdk-go v1.44.137 h1:GH2bUPiW7/gHtB04NxQOSOrKqFNjLGKmqt5YaO+K1SE=
100-
github.com/aws/aws-sdk-go v1.44.137/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
99+
github.com/aws/aws-sdk-go v1.44.184 h1:/MggyE66rOImXJKl1HqhLQITvWvqIV7w1Q4MaG6FHUo=
100+
github.com/aws/aws-sdk-go v1.44.184/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
101101
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
102102
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
103103
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

0 commit comments

Comments
 (0)