From c5283ff0de5522f34590d4f0a7b51600d832b89b Mon Sep 17 00:00:00 2001
From: Frank Terragna <fterragna@gmail.com>
Date: Mon, 23 Jul 2018 14:02:25 -0400
Subject: [PATCH] Removed kube2iam workaround

---
 Gopkg.lock                   | 53 ++++++++++++++++++++++++++++++++++--
 cmd/simplesqsd/simplesqsd.go |  9 ------
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 1d8308a..d43c0e1 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,10 +3,42 @@
 
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
-  packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/xml/xmlutil","service/sqs","service/sqs/sqsiface","service/sts"]
+  packages = [
+    "aws",
+    "aws/awserr",
+    "aws/awsutil",
+    "aws/client",
+    "aws/client/metadata",
+    "aws/corehandlers",
+    "aws/credentials",
+    "aws/credentials/ec2rolecreds",
+    "aws/credentials/endpointcreds",
+    "aws/credentials/stscreds",
+    "aws/defaults",
+    "aws/ec2metadata",
+    "aws/endpoints",
+    "aws/request",
+    "aws/session",
+    "aws/signer/v4",
+    "internal/shareddefaults",
+    "private/protocol",
+    "private/protocol/query",
+    "private/protocol/query/queryutil",
+    "private/protocol/rest",
+    "private/protocol/xml/xmlutil",
+    "service/sqs",
+    "service/sqs/sqsiface",
+    "service/sts"
+  ]
   revision = "586c9ba6027a527800564282bb843d7e6e7985c9"
   version = "v1.12.72"
 
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
 [[projects]]
   name = "github.com/go-ini/ini"
   packages = ["."]
@@ -18,12 +50,24 @@
   packages = ["."]
   revision = "0b12d6b5"
 
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
   revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"
   version = "v1.0.4"
 
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = ["assert"]
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"
+
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
@@ -33,12 +77,15 @@
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
+  packages = [
+    "unix",
+    "windows"
+  ]
   revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "7d95de2b43aa997d32f84aa9b619c761a5c13abbde083d61311f29c97e755c68"
+  inputs-digest = "54e081b3236f22d2b8bc42e459efb91da92941b55e40aa7460b599a3be03b5f9"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/cmd/simplesqsd/simplesqsd.go b/cmd/simplesqsd/simplesqsd.go
index 5d9dbdc..41d01cd 100644
--- a/cmd/simplesqsd/simplesqsd.go
+++ b/cmd/simplesqsd/simplesqsd.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"os"
 	"strconv"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -85,14 +84,6 @@ func main() {
 
 	sqsSvc := sqs.New(awsSess, sqsConfig)
 
-	// To workaround a kube2iam issue, expire credentials every minute.
-	go func() {
-		for {
-			sqsSvc.Config.Credentials.Expire()
-			time.Sleep(time.Minute)
-		}
-	}()
-
 	wConf := supervisor.WorkerConfig{
 		QueueURL:         c.QueueURL,
 		QueueMaxMessages: c.QueueMaxMessages,