From 904c5ae576a15529fad885508be573c76d8601f5 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Wed, 17 Feb 2016 14:29:53 -0800 Subject: [PATCH 1/3] Update Travis to use Go 1.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9643758034..7222db7316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: go go: - - 1.5 + - 1.6 # Need to ensure at least something remains in the install stanza to opt out of # Travis's built-in 'godep restore', which will fail Travis From a040110c0ff810101873a01a8994247a72147379 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Thu, 18 Feb 2016 08:51:27 -0800 Subject: [PATCH 2/3] Gix gofmt errors --- builtin/providers/google/resource_storage_bucket_acl_test.go | 1 - builtin/providers/google/resource_storage_object_acl_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/builtin/providers/google/resource_storage_bucket_acl_test.go b/builtin/providers/google/resource_storage_bucket_acl_test.go index a8b11e8f62..5ccce38dc0 100644 --- a/builtin/providers/google/resource_storage_bucket_acl_test.go +++ b/builtin/providers/google/resource_storage_bucket_acl_test.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - //"google.golang.org/api/storage/v1" ) diff --git a/builtin/providers/google/resource_storage_object_acl_test.go b/builtin/providers/google/resource_storage_object_acl_test.go index 5cac86a14b..9833849382 100644 --- a/builtin/providers/google/resource_storage_object_acl_test.go +++ b/builtin/providers/google/resource_storage_object_acl_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - //"google.golang.org/api/storage/v1" ) From 4956b1a3e9a04502e172db96a17e93c26fa3a48f Mon Sep 17 00:00:00 2001 From: James Nugent Date: Thu, 18 Feb 2016 09:42:00 -0800 Subject: [PATCH 3/3] provider/chef: Fix go vet issues This is rather hacky but it should get rid of our last remaining go vet warning. This appears to be golang/go#9171, which was closed as "Unfortunate" --- builtin/providers/chef/resource_role_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/providers/chef/resource_role_test.go b/builtin/providers/chef/resource_role_test.go index 3859e4e858..e9eaaa7cd6 100644 --- a/builtin/providers/chef/resource_role_test.go +++ b/builtin/providers/chef/resource_role_test.go @@ -32,11 +32,12 @@ func TestAccRole_basic(t *testing.T) { return fmt.Errorf("wrong description; expected %v, got %v", expected, role.Description) } - expectedRunList := chefc.RunList{ + expectedRunListStrings := []string{ "recipe[terraform@1.0.0]", "recipe[consul]", "role[foo]", } + expectedRunList := chefc.RunList(expectedRunListStrings) if !reflect.DeepEqual(role.RunList, expectedRunList) { return fmt.Errorf("wrong runlist; expected %#v, got %#v", expectedRunList, role.RunList) }