From 88864eb30b3156ff0d80422def96bf362d7355d9 Mon Sep 17 00:00:00 2001
From: Jason Del Ponte <delpontej@gmail.com>
Date: Tue, 4 Dec 2018 13:37:57 -0800
Subject: [PATCH] Fixup SDK's vet usage to use go vet with build tags (#2300)

Updates the SDK's usage of vet to use go vet instead of go tool vet.
This allows the SDK to pass build tags and packages instead of just
folder paths to the tool.

Fixes SDK's CI test failure with Go Tip.
---
 Makefile                              |  6 ++---
 private/model/api/examples_builder.go |  3 ---
 private/model/api/passes.go           |  1 -
 service/sqs/api_test.go               | 34 ---------------------------
 4 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 service/sqs/api_test.go

diff --git a/Makefile b/Makefile
index c474f72e9bc..7f64da32cc0 100644
--- a/Makefile
+++ b/Makefile
@@ -166,11 +166,11 @@ lint:
 	echo "$$lint"; \
 	if [ "$$lint" != "" ]; then exit 1; fi
 
-SDK_BASE_FOLDERS=$(shell ls -d */ | grep -v vendor | grep -v awsmigrate)
-GO_VET_CMD=go tool vet --all -shadow
+SDK_BASE_FOLDERS=$(shell go list ./... | grep -v vendor | grep -v awsmigrate)
 
 vet:
-	${GO_VET_CMD} ${SDK_BASE_FOLDERS}
+	@echo "go vet SDK packages"
+	@go vet -tags "example codegen integration" -all ${SDK_BASE_FOLDERS}
 
 get-deps: get-deps-tests get-deps-x-tests get-deps-codegen get-deps-verify
 
diff --git a/private/model/api/examples_builder.go b/private/model/api/examples_builder.go
index ccbfff62b90..fbe8e928333 100644
--- a/private/model/api/examples_builder.go
+++ b/private/model/api/examples_builder.go
@@ -162,7 +162,6 @@ func (builder defaultExamplesBuilder) BuildScalar(name, memName string, ref *Sha
 	default:
 		panic(fmt.Errorf("Unsupported scalar type: %v", reflect.TypeOf(v)))
 	}
-	return ""
 }
 
 func (builder defaultExamplesBuilder) BuildComplex(name, memName string, ref *ShapeRef, v map[string]interface{}) string {
@@ -180,8 +179,6 @@ func (builder defaultExamplesBuilder) BuildComplex(name, memName string, ref *Sh
 	default:
 		panic(fmt.Sprintf("Expected complex type but recieved %q", ref.Shape.Type))
 	}
-
-	return ""
 }
 
 func (builder defaultExamplesBuilder) GoType(ref *ShapeRef, elem bool) string {
diff --git a/private/model/api/passes.go b/private/model/api/passes.go
index c44dadd4318..a4333dd1998 100644
--- a/private/model/api/passes.go
+++ b/private/model/api/passes.go
@@ -81,7 +81,6 @@ func (r *referenceResolver) resolveReference(ref *ShapeRef) {
 	shape, ok := r.API.Shapes[ref.ShapeName]
 	if !ok {
 		panic(fmt.Sprintf("unable resolve reference, %s", ref.ShapeName))
-		return
 	}
 
 	if ref.JSONValue {
diff --git a/service/sqs/api_test.go b/service/sqs/api_test.go
deleted file mode 100644
index 3cf70eb55a6..00000000000
--- a/service/sqs/api_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// +build integration
-
-package sqs_test
-
-import (
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/awstesting/unit"
-	"github.com/aws/aws-sdk-go/service/sqs"
-)
-
-func TestFlattenedTraits(t *testing.T) {
-	s := sqs.New(unit.Session)
-	_, err := s.DeleteMessageBatch(&sqs.DeleteMessageBatchInput{
-		QueueURL: aws.String("QUEUE"),
-		Entries: []*sqs.DeleteMessageBatchRequestEntry{
-			{
-				ID:            aws.String("TEST"),
-				ReceiptHandle: aws.String("RECEIPT"),
-			},
-		},
-	})
-
-	if err == nil {
-		t.Fatalf("expect error, got nil")
-	}
-	if e, a := "InvalidAddress", err.Code(); e != a {
-		t.Errorf("expect %v, got %v", e, a)
-	}
-	if e, a := "The address QUEUE is not valid for this endpoint.", err.Message(); e != a {
-		t.Errorf("expect %v, got %v", e, a)
-	}
-}