From e41048f0647d5474661c93494b8570e2a487666d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bryan=E2=84=A2=EF=B8=8F?= Date: Mon, 10 May 2021 12:54:32 -0500 Subject: [PATCH 1/2] upgrade to go 1.16 --- .github/workflows/ci.yml | 2 +- Dockerfile | 2 +- Dockerfile.windows | 2 +- README.md | 2 +- go.mod | 2 +- test/webhook-test-proxy/Dockerfile.windows | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b925d925..24a79032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: NTH Continuous Integration and Release on: [push, pull_request, workflow_dispatch] env: - DEFAULT_GO_VERSION: ^1.15 + DEFAULT_GO_VERSION: ^1.16 GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }} GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }} WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} diff --git a/Dockerfile b/Dockerfile index e119d0f9..d2129205 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.15 as builder +FROM golang:1.16 as builder ## GOLANG env ARG GOPROXY="https://proxy.golang.org|direct" diff --git a/Dockerfile.windows b/Dockerfile.windows index ab985da3..0aa0e349 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,7 +1,7 @@ ARG WINDOWS_VERSION=1809 # Build the manager binary -FROM --platform=windows/amd64 golang:1.15 as builder +FROM --platform=windows/amd64 golang:1.16 as builder ## GOLANG env ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64" diff --git a/README.md b/README.md index 935db07c..a7eca4df 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ kubernetes - + go-version diff --git a/go.mod b/go.mod index d007fe02..c492ca8c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/aws-node-termination-handler -go 1.15 +go 1.16 require ( github.com/aws/aws-sdk-go v1.33.1 diff --git a/test/webhook-test-proxy/Dockerfile.windows b/test/webhook-test-proxy/Dockerfile.windows index 7a362232..3eddbfb3 100644 --- a/test/webhook-test-proxy/Dockerfile.windows +++ b/test/webhook-test-proxy/Dockerfile.windows @@ -1,7 +1,7 @@ ARG WINDOWS_VERSION=1903 # Build the manager binary -FROM --platform=windows/amd64 golang:1.15 AS builder +FROM --platform=windows/amd64 golang:1.16 AS builder ## GOLANG env ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64" From 29b114cdc3d0a50727fd3c0f045ae4491c998143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bryan=E2=84=A2=EF=B8=8F?= Date: Mon, 10 May 2021 12:54:46 -0500 Subject: [PATCH 2/2] fix go-report-card --- pkg/monitor/sqsevent/sqs-monitor.go | 1 + pkg/monitor/sqsevent/sqs-monitor_test.go | 2 +- test/go-report-card-test/Dockerfile | 4 ++-- test/go-report-card-test/run-report-card-test.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/monitor/sqsevent/sqs-monitor.go b/pkg/monitor/sqsevent/sqs-monitor.go index 3e377b4b..8600e563 100644 --- a/pkg/monitor/sqsevent/sqs-monitor.go +++ b/pkg/monitor/sqsevent/sqs-monitor.go @@ -17,6 +17,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/aws/aws-node-termination-handler/pkg/monitor" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" diff --git a/pkg/monitor/sqsevent/sqs-monitor_test.go b/pkg/monitor/sqsevent/sqs-monitor_test.go index da6965fd..23387b30 100644 --- a/pkg/monitor/sqsevent/sqs-monitor_test.go +++ b/pkg/monitor/sqsevent/sqs-monitor_test.go @@ -498,7 +498,7 @@ func TestMonitor_DescribeInstancesError(t *testing.T) { } ec2Mock := h.MockedEC2{ DescribeInstancesResp: ec2.DescribeInstancesOutput{}, - DescribeInstancesErr: awserr.New("InvalidInstanceID.NotFound", "The instance ID 'i-0d6bd3ce2bf8a6751' does not exist\n\tstatus code: 400, request id: 6a5c30e2-922d-464c-946c-a1ec76e5920b", fmt.Errorf("original error")), + DescribeInstancesErr: awserr.New("InvalidInstanceID.NotFound", "The instance ID 'i-0d6bd3ce2bf8a6751' does not exist\n\tstatus code: 400, request id: 6a5c30e2-922d-464c-946c-a1ec76e5920b", fmt.Errorf("original error")), } drainChan := make(chan monitor.InterruptionEvent, 1) diff --git a/test/go-report-card-test/Dockerfile b/test/go-report-card-test/Dockerfile index c0c66031..662799fc 100644 --- a/test/go-report-card-test/Dockerfile +++ b/test/go-report-card-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1 +FROM public.ecr.aws/bitnami/golang:latest WORKDIR /app @@ -10,4 +10,4 @@ RUN go get github.com/gojp/goreportcard/cmd/goreportcard-cli RUN go get -u golang.org/x/tools/cmd/goimports -CMD $GOPATH/bin/goreportcard-cli -v -t 90 +CMD $GOPATH/bin/goreportcard-cli -v -t 90 \ No newline at end of file diff --git a/test/go-report-card-test/run-report-card-test.sh b/test/go-report-card-test/run-report-card-test.sh index cd8005d9..64330c81 100755 --- a/test/go-report-card-test/run-report-card-test.sh +++ b/test/go-report-card-test/run-report-card-test.sh @@ -12,7 +12,7 @@ function fail() { trap fail ERR docker build --build-arg=GOPROXY=direct -t go-report-card-cli $SCRIPTPATH -if [[ $(docker run -it -v $SCRIPTPATH/../../:/app go-report-card-cli /go/bin/goimports -l /app/) ]]; then +if [[ $(docker run -i -v $SCRIPTPATH/../../:/app go-report-card-cli /go/bin/goimports -l /app/) ]]; then echo "❌ goimports found a problem in go source files. See above for the files with problems." EXIT_CODE=2 else