From fac9413385c7ba871a20db33c09402870f7a4955 Mon Sep 17 00:00:00 2001
From: Greg Linton <lintong@pagodabox.com>
Date: Mon, 18 Jun 2018 12:48:46 -0600
Subject: [PATCH] Resolve dependency issues and update tests

---
 Gopkg.lock                              | 6 +++---
 Gopkg.toml                              | 2 +-
 plugins/inputs/mysql/mysql_test.go      | 2 +-
 plugins/outputs/kinesis/kinesis_test.go | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index ad49aa462ebdd..194bb61e64678 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -87,10 +87,10 @@
   revision = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"
 
 [[projects]]
+  branch = "master"
   name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
-  revision = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba"
-  version = "0.11.0"
+  revision = "f5f430df56871bc937950274b2c86681d3db6e59"
 
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
@@ -968,6 +968,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d6f5a0f8e2d2b1a63a34c104394aea56841db2d108d319991583da732215ab4d"
+  inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 8a7255cb96581..78d3749a99313 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -12,7 +12,7 @@
 
 [[constraint]]
   name = "github.com/apache/thrift"
-  version = "0.11.0"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/aws/aws-sdk-go"
diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
index 1820c9347aaac..b4983ba0e028f 100644
--- a/plugins/inputs/mysql/mysql_test.go
+++ b/plugins/inputs/mysql/mysql_test.go
@@ -49,7 +49,7 @@ func TestMysqlGetDSNTag(t *testing.T) {
 		},
 		{
 			"tcp(localhost)/",
-			"localhost",
+			"localhost:3306",
 		},
 		{
 			"root:passwd@tcp(192.168.1.1:3306)/?tls=false",
diff --git a/plugins/outputs/kinesis/kinesis_test.go b/plugins/outputs/kinesis/kinesis_test.go
index 281dbecb51126..3c6321abdc132 100644
--- a/plugins/outputs/kinesis/kinesis_test.go
+++ b/plugins/outputs/kinesis/kinesis_test.go
@@ -59,7 +59,7 @@ func TestPartitionKey(t *testing.T) {
 	partitionKey := k.getPartitionKey(testPoint)
 	u, err := uuid.FromString(partitionKey)
 	assert.Nil(err, "Issue parsing UUID")
-	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
+	assert.Equal(byte(4), u.Version(), "PartitionKey should be UUIDv4")
 
 	k = KinesisOutput{
 		PartitionKey: "-",
@@ -72,6 +72,5 @@ func TestPartitionKey(t *testing.T) {
 	partitionKey = k.getPartitionKey(testPoint)
 	u, err = uuid.FromString(partitionKey)
 	assert.Nil(err, "Issue parsing UUID")
-	assert.Equal(uint(4), u.Version(), "PartitionKey should be UUIDv4")
-
+	assert.Equal(byte(4), u.Version(), "PartitionKey should be UUIDv4")
 }