From 9c42e5931554fbcb4f12643f4b3ed3afc6d3c5ae Mon Sep 17 00:00:00 2001 From: n0rtr0n Date: Wed, 15 Jan 2025 19:15:48 -0800 Subject: [PATCH] Upgrading go version --- .circleci/config.yml | 2 +- Makefile | 2 +- go.mod | 21 ++++++++++++++------- golang.mk | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1327b8..5dd548d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: /go/src/github.com/Clever/amazon-kinesis-client-go docker: - - image: circleci/golang:1.13-stretch + - image: cimg/go:1.21 - image: circleci/mongo:3.2.20-jessie-ram environment: GOPRIVATE: github.com/Clever/* diff --git a/Makefile b/Makefile index 5d0de9c..9a0e8eb 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SHELL := /bin/bash PKG := github.com/Clever/amazon-kinesis-client-go PKGS := $(shell go list ./... | grep -v /vendor ) .PHONY: download_jars run build -$(eval $(call golang-version-check,1.13)) +$(eval $(call golang-version-check,1.21)) CONSUMER ?= consumer TMP_DIR := ./tmp-jars diff --git a/go.mod b/go.mod index faa1929..6b2d442 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,28 @@ module github.com/amazon-kinesis-client-go -go 1.13 +go 1.21 require ( github.com/Clever/amazon-kinesis-client-go v1.0.0 github.com/Clever/syslogparser v0.0.0-20170816194131-fb28ad3e4340 github.com/a8m/kinesis-producer v0.2.0 - github.com/aws/aws-sdk-go v1.35.28 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.2 - github.com/jeromer/syslogparser v0.0.0-20190429161531-5fbaaf06d9e7 // indirect - github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d // indirect github.com/stretchr/testify v1.7.0 - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect - github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7 // indirect golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e gopkg.in/Clever/kayvee-go.v6 v6.24.1 +) + +require ( + github.com/aws/aws-sdk-go v1.35.28 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/jeromer/syslogparser v0.0.0-20190429161531-5fbaaf06d9e7 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7 // indirect + google.golang.org/protobuf v1.26.0 // indirect gopkg.in/yaml.v2 v2.3.1-0.20200602174213-b893565b90ca // indirect gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect diff --git a/golang.mk b/golang.mk index 22bade9..68fea8a 100644 --- a/golang.mk +++ b/golang.mk @@ -1,7 +1,7 @@ # This is the default Clever Golang Makefile. # It is stored in the dev-handbook repo, github.com/Clever/dev-handbook # Please do not alter this file directly. -GOLANG_MK_VERSION := 1.3.0 +GOLANG_MK_VERSION := 1.3.1 SHELL := /bin/bash SYSTEM := $(shell uname -a | cut -d" " -f1 | tr '[:upper:]' '[:lower:]') @@ -48,7 +48,7 @@ golang-ensure-curl-installed: # We pin its version because an update could add a new lint check which would make # previously passing tests start failing without changing our code. # this package is deprecated and frozen -# Infra recomendation is to eventaully move to https://github.com/golangci/golangci-lint so don't fail on linting error for now +# Infra recommendation is to eventually move to https://github.com/golangci/golangci-lint so don't fail on linting error for now GOLINT := $(GOPATH)/bin/golint $(GOLINT): go install -mod=readonly golang.org/x/lint/golint@738671d3881b9731cc63024d5d88cf28db875626