From d4f61734bfbe7e070ec086009160535c2b3e0888 Mon Sep 17 00:00:00 2001
From: Haitao Li <hli@atlassian.com>
Date: Tue, 5 Mar 2024 11:43:26 +1100
Subject: [PATCH] Bump aws-go-sdk

---
 .github/workflows/golangci-lint.yml | 5 +++--
 Dockerfile                          | 3 ++-
 Makefile                            | 9 +++++----
 go.mod                              | 2 +-
 go.sum                              | 2 ++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 146da1b..70dfa20 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -12,8 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-go@v5
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.51.0
+          version: v1.54
           args: --timeout=5m
diff --git a/Dockerfile b/Dockerfile
index 0312de9..fa4c523 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
 FROM --platform=$BUILDPLATFORM golang:1.20 as builder
 ARG TARGETPLATFORM
+ARG ENVVAR
 WORKDIR /go/src/github.com/atlassian-labs/cyclops
 COPY go.mod go.sum Makefile ./
 COPY cmd cmd
 COPY pkg pkg
-RUN make build-linux
+RUN make build-linux ENVVAR=$ENVVAR
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
diff --git a/Makefile b/Makefile
index ea32deb..93aefb6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ VERSION = 1.9.1
 # IMPORTANT! Update api version if a new release affects cnr
 API_VERSION = 1.0.0
 IMAGE = cyclops:$(VERSION)
+ENVVAR ?= CGO_ENABLED=0
 ARCH=$(if $(TARGETPLATFORM),$(lastword $(subst /, ,$(TARGETPLATFORM))),amd64)
 BASE_PACKAGE = github.com/atlassian-labs/cyclops/pkg
 CLI_BUILD_LD_FLAGS= -X 'main.version=${VERSION}' -X '${BASE_PACKAGE}/cli.apiVersion=${API_VERSION}'
@@ -30,13 +31,13 @@ build-cli:
 build: build-manager build-cli build-observer
 
 build-manager-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${MANAGER_BIN} -ldflags="${MANAGER_BUILD_LD_FLAGS}" cmd/manager/main.go
+	$(ENVVAR) GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${MANAGER_BIN} -ldflags="${MANAGER_BUILD_LD_FLAGS}" cmd/manager/main.go
 
 build-cli-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${CLI_BIN} -ldflags="${CLI_BUILD_LD_FLAGS}" cmd/cli/main.go
+	$(ENVVAR) GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${CLI_BIN} -ldflags="${CLI_BUILD_LD_FLAGS}" cmd/cli/main.go
 
 build-observer-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${OBSERVER_BIN} -ldflags="${OBSERVER_BUILD_LD_FLAGS}" cmd/observer/main.go
+	$(ENVVAR) GOOS=linux GOARCH=$(ARCH) go build -a -installsuffix cgo -o bin/linux/${OBSERVER_BIN} -ldflags="${OBSERVER_BUILD_LD_FLAGS}" cmd/observer/main.go
 
 build-linux: build-manager-linux build-cli-linux build-observer-linux
 
@@ -57,7 +58,7 @@ lint:
 	golangci-lint run
 
 docker:
-	docker buildx build -t $(IMAGE) --platform linux/$(ARCH) .
+	docker buildx build --build-arg ENVVAR="$(ENVVAR)" -t $(IMAGE) --platform linux/$(ARCH) .
 
 # New version of operator-sdk no longer support generate CRDs directly
 # Build from release v0.19.0 with commit hash 
diff --git a/go.mod b/go.mod
index eeb99c6..1f4fbaa 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/atlassian-labs/cyclops
 go 1.20
 
 require (
-	github.com/aws/aws-sdk-go v1.36.27
+	github.com/aws/aws-sdk-go v1.50.31
 	github.com/cenkalti/backoff/v4 v4.1.3
 	github.com/go-logr/logr v1.2.4
 	github.com/google/uuid v1.3.0
diff --git a/go.sum b/go.sum
index e6d9990..40ac6b5 100644
--- a/go.sum
+++ b/go.sum
@@ -52,6 +52,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.36.27 h1:wc3xLJJHog2SwiqlLnrLUuct/n+dBjB45QhuZw2psVE=
 github.com/aws/aws-sdk-go v1.36.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.50.31 h1:gx2NRLLEDUmQFC4YUsfMUKkGCwpXVO8ijUecq/nOQGA=
+github.com/aws/aws-sdk-go v1.50.31/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=