Bump go and etcd patch versions (#3965)

Signed-off-by: Nikki Attea <nikki@sensu.io>
Co-authored-by: Justin Kolberg <amd.prophet@gmail.com>

.appveyor.yml

@@ -13,7 +13,7 @@ cache:
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.13.7
+  GOVERSION: 1.13.15
   GO111MODULE: 'on'
   GOPROXY: 'https://proxy.golang.org'
 

.circleci/config.yml

@@ -1,17 +1,11 @@
-# Golang CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2.1
 
-version: 2
+orbs:
+  go: circleci/go@1.1.2
 
 sensu_go_build_env: &sensu_go_build_env
-  #### TEMPLATE_NOTE: go expects specific checkout path representing url
-  #### expecting it in the form of
-  ####   /go/src/github.com/circleci/go-tool
-  ####   /go/src/bitbucket.org/circleci/go-tool
-  working_directory: /go/src/github.com/sensu/sensu-go
   docker:
-    - image: circleci/golang:1.13.7
+    - image: cimg/go:1.13.15
 
 jobs:
   test:
@@ -23,17 +17,11 @@ jobs:
     parallelism: 2
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - go-mod-v1-{{ checksum "go.sum" }}
+      - go/mod-download-cached
 
       # Run tests
       - run: ./build.sh unit
       - run: ./build.sh integration
-      - save_cache:
-          key: go-mod-v1-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg/mod"
 
 workflows:
   version: 2

.github/workflows/golangci-lint.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.7
+          go-version: 1.13.15
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.12
+          go-version: 1.13.15
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.12
+          go-version: 1.13.15
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.12
+          go-version: 1.13.15
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.12
+          go-version: 1.13.15
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:

CHANGELOG.md

@@ -57,6 +57,8 @@ characters.
 - Enriches output of `sensuctl asset add` with help usage for how to use the runtime asset.
 - Unless the entity is a proxy entity, updates to entities now ignore state
   related fields.
+- Upgraded Go version from 1.13.7 to 1.13.15.
+- Upgraded etcd version from 3.3.17 to 3.3.22.
 
 ## [5.21.0] - 2020-06-10
 

go.mod

@@ -15,11 +15,13 @@ require (
 	github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
 	github.com/ash2k/stager v0.0.0-20170622123058-6e9c7b0eacd4 // indirect
 	github.com/atlassian/gostatsd v0.0.0-20180514010436-af796620006e
-	github.com/coreos/etcd v3.3.17+incompatible
+	github.com/coreos/bbolt v1.3.3 // indirect
+	github.com/coreos/etcd v3.3.22+incompatible
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
 	github.com/dave/jennifer v0.0.0-20171207062344-d8bdbdbee4e1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/docker/docker v0.0.0-20180409082103-cbde00b44273
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/echlebek/crock v1.0.1
 	github.com/echlebek/timeproxy v1.0.0
 	github.com/emicklei/proto v1.1.0