From 842885e9a7349ae1a1e617731af8fc0932910c2a Mon Sep 17 00:00:00 2001
From: Amey Bhide <ameyb@splunk.com>
Date: Wed, 20 Nov 2019 11:19:01 -0800
Subject: [PATCH 1/2] Update go version to 1.13.4

---
 .circleci/config.yml | 2 +-
 Makefile             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d1b9a7..1794c35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     working_directory: /go/workdir/src/github.com/splunk/vault-plugin-splunk
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.13.4
         <<: *defaultenv
       - image: splunk/splunk:latest
         user: root
diff --git a/Makefile b/Makefile
index e370515..9c8b3bf 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ lint: dep
 
 .PHONY: dep
 dep:
-	./scripts/golangci-lint.sh -b $(GOBIN) v1.17.1
+	./scripts/golangci-lint.sh -b $(GOBIN) v1.20.0
 
 .PHONY: clean
 clean:

From 998e722f0a3f171a6f9b180abd9df6763bcc5214 Mon Sep 17 00:00:00 2001
From: Amey Bhide <ameyb@splunk.com>
Date: Wed, 20 Nov 2019 11:21:50 -0800
Subject: [PATCH 2/2] Reorder circleci targets

Run `make lint` before any tests.
---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1794c35..0d34fe1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,15 +19,15 @@ jobs:
       - GOCACHE: /tmp/go/cache
     steps:
       - checkout
+      - run:
+          name: Code Quality
+          command: make lint
       - run:
           name: Wait for Splunk Container
           command: curl -4sSk --retry 40 --retry-connrefused --retry-delay 3 -o /dev/null ${SPLUNK_ADDR}
       - run:
           name: Test
           command: make test TESTREPORT=test-results/go/results.xml
-      - run:
-          name: Code Quality
-          command: make lint
       - run:
           name: Release
           command: |