Upgrade to Go 1.16 and fix report-card (#427)

* upgrade to go 1.16

* fix go-report-card

Author: brycahta

.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 }}

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"

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"

README.md

@@ -6,7 +6,7 @@
   <a href="https://github.com/kubernetes/kubernetes/releases">
     <img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.11-brightgreen" alt="kubernetes">
   </a>
-  <a href="https://golang.org/doc/go1.15">
+  <a href="https://golang.org/doc/go1.16">
     <img src="https://img.shields.io/github/go-mod/go-version/aws/aws-node-termination-handler?color=blueviolet" alt="go-version">
   </a>
   <a href="https://opensource.org/licenses/Apache-2.0">

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

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"

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)
 

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

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

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"