From eaeab0b583c4990d5a93e57c7dc2a68ce77c7af7 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 19 Aug 2021 10:19:25 -0500 Subject: [PATCH 1/2] upgrade go to 1.17 --- .github/workflows/ci.yaml | 2 +- Dockerfile | 2 +- README.md | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d06e15a..4185d86 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: EC2 Instance Selector CI and Release on: [push, pull_request, workflow_dispatch] env: - DEFAULT_GO_VERSION: ^1.16 + DEFAULT_GO_VERSION: ^1.17 GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }} GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/Dockerfile b/Dockerfile index f4ff220..5ff96fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM public.ecr.aws/bitnami/golang:1.16 as builder +FROM public.ecr.aws/bitnami/golang:1.17 as builder ## GOLANG env ARG GOPROXY="https://proxy.golang.org|direct" diff --git a/README.md b/README.md index 7a05457..810b5ea 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory.

- + go-version diff --git a/go.mod b/go.mod index fcf4a69..d82091b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-ec2-instance-selector/v2 -go 1.16 +go 1.17 require ( github.com/aws/aws-sdk-go v1.38.27 From 94b805c18c6127b9c292180b92721e739138baa5 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 19 Aug 2021 10:36:14 -0500 Subject: [PATCH 2/2] update go mod --- go.mod | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/go.mod b/go.mod index d82091b..d31add8 100644 --- a/go.mod +++ b/go.mod @@ -14,3 +14,9 @@ require ( github.com/spf13/pflag v1.0.3 gopkg.in/ini.v1 v1.57.0 ) + +require ( + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect +)