From cbf34bfae0bb74c5ca9b475f594a70558f0eecb9 Mon Sep 17 00:00:00 2001
From: Shlomo Heigh <shlomo.heigh@cyberark.com>
Date: Thu, 28 Oct 2021 10:24:06 -0400
Subject: [PATCH] Update to Go 1.16

Fixes build failing due to goconvey dependency change
---
 CHANGELOG.md     | 3 +++
 Dockerfile       | 2 +-
 Dockerfile.debug | 2 +-
 Dockerfile.dev   | 2 +-
 Dockerfile.test  | 2 +-
 go.mod           | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25696e686..459781f96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+- The project Golang version is updated from the end-of-life v1.15 to version v1.16. [cyberark/secretless-broker#1434](https://github.com/cyberark/secretless-broker/pull/1434/)
+
 ### Fixed
 - Request-signing on the AWS connector was updated to address a bug that was
   causing failed integrity checks, where the request-signing by Secretless was
diff --git a/Dockerfile b/Dockerfile
index e2ae4042b..b80ebdcb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster as secretless-builder
+FROM golang:1.16-buster as secretless-builder
 MAINTAINER CyberArk Software Ltd.
 LABEL builder="secretless-builder"
 
diff --git a/Dockerfile.debug b/Dockerfile.debug
index 15e866929..57f153bbe 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster as secretless-builder
+FROM golang:1.16-buster as secretless-builder
 MAINTAINER CyberArk Software Ltd.
 LABEL builder="secretless-builder"
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 7f3d4d4e6..09afb8a69 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster
+FROM golang:1.16-buster
 MAINTAINER CyberArk Software Ltd.
 
 # On CyberArk dev laptops, golang module dependencies are downloaded with a
diff --git a/Dockerfile.test b/Dockerfile.test
index c280708b3..710385ff8 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine
+FROM golang:1.16-alpine
 MAINTAINER CyberArk Software Ltd.
 LABEL id="secretless-test-runner"
 
diff --git a/go.mod b/go.mod
index ee233ee8d..8d4988372 100644
--- a/go.mod
+++ b/go.mod
@@ -60,4 +60,4 @@ replace github.com/denisenkom/go-mssqldb => ./third_party/go-mssqldb
 // This is our fix:
 replace honnef.co/go/tools => github.com/dominikh/go-tools v0.0.1-2019.2.3
 
-go 1.15
+go 1.16