Merge pull request #2 from jasdel/cleanup/MoveAwstesting

Cleanup/move awstesting
aws · Oct 10, 2017 · 1d3a1b3 · 1d3a1b3
2 parents fc704cf + f082393
commit 1d3a1b3
Show file tree

Hide file tree

Showing 146 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-LINTIGNOREDOT='awstesting/integration.+should not use dot imports'
+LINTIGNOREDOT='internal/awstesting/integration.+should not use dot imports'
 LINTIGNOREDOC='service/[^/]+/(api|service|waiters)\.go:.+(comment on exported|should have comment or be unexported)'
 LINTIGNORECONST='service/[^/]+/(api|service|waiters)\.go:.+(type|struct field|const|func) ([^ ]+) should be ([^ ]+)'
 LINTIGNORESTUTTER='service/[^/]+/(api|service)\.go:.+(and that stutters)'
@@ -63,71 +63,71 @@ unit-with-race-cover: get-deps-tests build verify
 integration: get-deps-tests integ-custom smoke-tests performance
 
 integ-custom:
-	go test -tags "integration" ./awstesting/integration/customizations/...
+	go test -tags "integration" ./internal/awstesting/integration/customizations/...
 
 cleanup-integ:
-	go run -tags "integration" ./awstesting/cmd/bucket_cleanup/main.go "aws-sdk-go-integration"
+	go run -tags "integration" ./internal/awstesting/cmd/bucket_cleanup/main.go "aws-sdk-go-integration"
 
 smoke-tests: get-deps-tests
-	gucumber -go-tags "integration" ./awstesting/integration/smoke
+	gucumber -go-tags "integration" ./internal/awstesting/integration/smoke
 
 performance: get-deps-tests
-	AWS_TESTING_LOG_RESULTS=${log-detailed} AWS_TESTING_REGION=$(region) AWS_TESTING_DB_TABLE=$(table) gucumber -go-tags "integration" ./awstesting/performance
+	AWS_TESTING_LOG_RESULTS=${log-detailed} AWS_TESTING_REGION=$(region) AWS_TESTING_DB_TABLE=$(table) gucumber -go-tags "integration" ./internal/awstesting/performance
 
 sandbox-tests: sandbox-test-go15 sandbox-test-go15-novendorexp sandbox-test-go16 sandbox-test-go17 sandbox-test-go18 sandbox-test-go19 sandbox-test-gotip
 
 sandbox-build-go15:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
 sandbox-go15: sandbox-build-go15
 	docker run -i -t aws-sdk-go-1.5 bash
 sandbox-test-go15: sandbox-build-go15
 	docker run -t aws-sdk-go-1.5
 
 sandbox-build-go15-novendorexp:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
 sandbox-go15-novendorexp: sandbox-build-go15-novendorexp
 	docker run -i -t aws-sdk-go-1.5-novendorexp bash
 sandbox-test-go15-novendorexp: sandbox-build-go15-novendorexp
 	docker run -t aws-sdk-go-1.5-novendorexp
 
 sandbox-build-go16:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
 sandbox-go16: sandbox-build-go16
 	docker run -i -t aws-sdk-go-1.6 bash
 sandbox-test-go16: sandbox-build-go16
 	docker run -t aws-sdk-go-1.6
 
 sandbox-build-go17:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
 sandbox-go17: sandbox-build-go17
 	docker run -i -t aws-sdk-go-1.7 bash
 sandbox-test-go17: sandbox-build-go17
 	docker run -t aws-sdk-go-1.7
 
 sandbox-build-go18:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
 sandbox-go18: sandbox-build-go18
 	docker run -i -t aws-sdk-go-1.8 bash
 sandbox-test-go18: sandbox-build-go18
 	docker run -t aws-sdk-go-1.8
 
 sandbox-build-go19:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.9" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.9" .
 sandbox-go19: sandbox-build-go19
 	docker run -i -t aws-sdk-go-1.9 bash
 sandbox-test-go19: sandbox-build-go19
 	docker run -t aws-sdk-go-1.9
 
 sandbox-build-gotip:
 	@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
-	docker build -f ./awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
+	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
 sandbox-gotip: sandbox-build-gotip
 	docker run -i -t aws-sdk-go-tip bash
 sandbox-test-gotip: sandbox-build-gotip
 	docker run -t aws-sdk-go-tip
 
 update-aws-golang-tip:
-	docker build --no-cache=true -f ./awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
+	docker build --no-cache=true -f ./internal/awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
 
 verify: get-deps-verify lint vet
 
@@ -147,7 +147,7 @@ else
 	GO_VET_CMD=go tool vet --all -shadow
 endif
 
-vet:
+vetinternal/:
 	${GO_VET_CMD} ${SDK_BASE_FOLDERS}
 
 get-deps: get-deps-tests get-deps-verify

diff --git a/awstesting/assert.go → internal/awstesting/assert.go b/awstesting/assert.go → internal/awstesting/assert.go
diff --git a/awstesting/assert_test.go → internal/awstesting/assert_test.go b/awstesting/assert_test.go → internal/awstesting/assert_test.go
diff --git a/awstesting/client.go → internal/awstesting/client.go b/awstesting/client.go → internal/awstesting/client.go
diff --git a/awstesting/cmd/bucket_cleanup/main.go → ...nal/awstesting/cmd/bucket_cleanup/main.go b/awstesting/cmd/bucket_cleanup/main.go → ...nal/awstesting/cmd/bucket_cleanup/main.go
diff --git a/awstesting/custom_ca_bundle.go → internal/awstesting/custom_ca_bundle.go b/awstesting/custom_ca_bundle.go → internal/awstesting/custom_ca_bundle.go
diff --git a/...ion/customizations/s3/integration_test.go → ...ion/customizations/s3/integration_test.go b/...ion/customizations/s3/integration_test.go → ...ion/customizations/s3/integration_test.go
diff --git a/...tion/customizations/s3/s3crypto/client.go → ...tion/customizations/s3/s3crypto/client.go b/...tion/customizations/s3/s3crypto/client.go → ...tion/customizations/s3/s3crypto/client.go
diff --git a/...tomizations/s3/s3crypto/s3_crypto.feature → ...tomizations/s3/s3crypto/s3_crypto.feature b/...tomizations/s3/s3crypto/s3_crypto.feature → ...tomizations/s3/s3crypto/s3_crypto.feature
diff --git a/...ion/customizations/s3/s3crypto/stepdef.go → ...ion/customizations/s3/s3crypto/stepdef.go b/...ion/customizations/s3/s3crypto/stepdef.go → ...ion/customizations/s3/s3crypto/stepdef.go
diff --git a/...ations/s3/s3manager/bucket_region_test.go → ...ations/s3/s3manager/bucket_region_test.go b/...ations/s3/s3manager/bucket_region_test.go → ...ations/s3/s3manager/bucket_region_test.go
diff --git a/...izations/s3/s3manager/integration_test.go → ...izations/s3/s3manager/integration_test.go b/...izations/s3/s3manager/integration_test.go → ...izations/s3/s3manager/integration_test.go
diff --git a/...ation/customizations/s3/s3manager/stub.go → ...ation/customizations/s3/s3manager/stub.go b/...ation/customizations/s3/s3manager/stub.go → ...ation/customizations/s3/s3manager/stub.go
diff --git a/...ing/integration/customizations/s3/stub.go → ...ing/integration/customizations/s3/stub.go b/...ing/integration/customizations/s3/stub.go → ...ing/integration/customizations/s3/stub.go
diff --git a/awstesting/integration/integration.go → ...nal/awstesting/integration/integration.go b/awstesting/integration/integration.go → ...nal/awstesting/integration/integration.go
diff --git a/awstesting/integration/smoke/acm/acm.feature → ...testing/integration/smoke/acm/acm.feature b/awstesting/integration/smoke/acm/acm.feature → ...testing/integration/smoke/acm/acm.feature
diff --git a/awstesting/integration/smoke/acm/client.go → ...wstesting/integration/smoke/acm/client.go b/awstesting/integration/smoke/acm/client.go → ...wstesting/integration/smoke/acm/client.go
diff --git a/...ation/smoke/apigateway/apigateway.feature → ...ation/smoke/apigateway/apigateway.feature b/...ation/smoke/apigateway/apigateway.feature → ...ation/smoke/apigateway/apigateway.feature
diff --git a/...ng/integration/smoke/apigateway/client.go → ...ng/integration/smoke/apigateway/client.go b/...ng/integration/smoke/apigateway/client.go → ...ng/integration/smoke/apigateway/client.go
diff --git a/...rvice/applicationdiscoveryservice.feature → ...rvice/applicationdiscoveryservice.feature b/...rvice/applicationdiscoveryservice.feature → ...rvice/applicationdiscoveryservice.feature
diff --git a/...oke/applicationdiscoveryservice/client.go → ...oke/applicationdiscoveryservice/client.go b/...oke/applicationdiscoveryservice/client.go → ...oke/applicationdiscoveryservice/client.go
diff --git a/...ion/smoke/autoscaling/autoscaling.feature → ...ion/smoke/autoscaling/autoscaling.feature b/...ion/smoke/autoscaling/autoscaling.feature → ...ion/smoke/autoscaling/autoscaling.feature
diff --git a/...g/integration/smoke/autoscaling/client.go → ...g/integration/smoke/autoscaling/client.go b/...g/integration/smoke/autoscaling/client.go → ...g/integration/smoke/autoscaling/client.go
diff --git a/...ntegration/smoke/cloudformation/client.go → ...ntegration/smoke/cloudformation/client.go b/...ntegration/smoke/cloudformation/client.go → ...ntegration/smoke/cloudformation/client.go
diff --git a/...oke/cloudformation/cloudformation.feature → ...oke/cloudformation/cloudformation.feature b/...oke/cloudformation/cloudformation.feature → ...oke/cloudformation/cloudformation.feature
diff --git a/...ng/integration/smoke/cloudfront/client.go → ...ng/integration/smoke/cloudfront/client.go b/...ng/integration/smoke/cloudfront/client.go → ...ng/integration/smoke/cloudfront/client.go
diff --git a/...ation/smoke/cloudfront/cloudfront.feature → ...ation/smoke/cloudfront/cloudfront.feature b/...ation/smoke/cloudfront/cloudfront.feature → ...ation/smoke/cloudfront/cloudfront.feature
diff --git a/...ting/integration/smoke/cloudhsm/client.go → ...ting/integration/smoke/cloudhsm/client.go b/...ting/integration/smoke/cloudhsm/client.go → ...ting/integration/smoke/cloudhsm/client.go
diff --git a/...tegration/smoke/cloudhsm/cloudhsm.feature → ...tegration/smoke/cloudhsm/cloudhsm.feature b/...tegration/smoke/cloudhsm/cloudhsm.feature → ...tegration/smoke/cloudhsm/cloudhsm.feature
diff --git a/...g/integration/smoke/cloudsearch/client.go → ...g/integration/smoke/cloudsearch/client.go b/...g/integration/smoke/cloudsearch/client.go → ...g/integration/smoke/cloudsearch/client.go
diff --git a/...ion/smoke/cloudsearch/cloudsearch.feature → ...ion/smoke/cloudsearch/cloudsearch.feature b/...ion/smoke/cloudsearch/cloudsearch.feature → ...ion/smoke/cloudsearch/cloudsearch.feature
diff --git a/...ng/integration/smoke/cloudtrail/client.go → ...ng/integration/smoke/cloudtrail/client.go b/...ng/integration/smoke/cloudtrail/client.go → ...ng/integration/smoke/cloudtrail/client.go
diff --git a/...ation/smoke/cloudtrail/cloudtrail.feature → ...ation/smoke/cloudtrail/cloudtrail.feature b/...ation/smoke/cloudtrail/cloudtrail.feature → ...ation/smoke/cloudtrail/cloudtrail.feature
diff --git a/...ng/integration/smoke/cloudwatch/client.go → ...ng/integration/smoke/cloudwatch/client.go b/...ng/integration/smoke/cloudwatch/client.go → ...ng/integration/smoke/cloudwatch/client.go
diff --git a/...ation/smoke/cloudwatch/cloudwatch.feature → ...ation/smoke/cloudwatch/cloudwatch.feature b/...ation/smoke/cloudwatch/cloudwatch.feature → ...ation/smoke/cloudwatch/cloudwatch.feature
diff --git a/...ntegration/smoke/cloudwatchlogs/client.go → ...ntegration/smoke/cloudwatchlogs/client.go b/...ntegration/smoke/cloudwatchlogs/client.go → ...ntegration/smoke/cloudwatchlogs/client.go
diff --git a/...oke/cloudwatchlogs/cloudwatchlogs.feature → ...oke/cloudwatchlogs/cloudwatchlogs.feature b/...oke/cloudwatchlogs/cloudwatchlogs.feature → ...oke/cloudwatchlogs/cloudwatchlogs.feature
diff --git a/...ng/integration/smoke/codecommit/client.go → ...ng/integration/smoke/codecommit/client.go b/...ng/integration/smoke/codecommit/client.go → ...ng/integration/smoke/codecommit/client.go
diff --git a/...ation/smoke/codecommit/codecommit.feature → ...ation/smoke/codecommit/codecommit.feature b/...ation/smoke/codecommit/codecommit.feature → ...ation/smoke/codecommit/codecommit.feature
diff --git a/...ng/integration/smoke/codedeploy/client.go → ...ng/integration/smoke/codedeploy/client.go b/...ng/integration/smoke/codedeploy/client.go → ...ng/integration/smoke/codedeploy/client.go
diff --git a/...ation/smoke/codedeploy/codedeploy.feature → ...ation/smoke/codedeploy/codedeploy.feature b/...ation/smoke/codedeploy/codedeploy.feature → ...ation/smoke/codedeploy/codedeploy.feature
diff --git a/.../integration/smoke/codepipeline/client.go → .../integration/smoke/codepipeline/client.go b/.../integration/smoke/codepipeline/client.go → .../integration/smoke/codepipeline/client.go
diff --git a/...n/smoke/codepipeline/codepipeline.feature → ...n/smoke/codepipeline/codepipeline.feature b/...n/smoke/codepipeline/codepipeline.feature → ...n/smoke/codepipeline/codepipeline.feature
diff --git a/...tegration/smoke/cognitoidentity/client.go → ...tegration/smoke/cognitoidentity/client.go b/...tegration/smoke/cognitoidentity/client.go → ...tegration/smoke/cognitoidentity/client.go
diff --git a/...e/cognitoidentity/cognitoidentity.feature → ...e/cognitoidentity/cognitoidentity.feature b/...e/cognitoidentity/cognitoidentity.feature → ...e/cognitoidentity/cognitoidentity.feature
diff --git a/...g/integration/smoke/cognitosync/client.go → ...g/integration/smoke/cognitosync/client.go b/...g/integration/smoke/cognitosync/client.go → ...g/integration/smoke/cognitosync/client.go
diff --git a/...ion/smoke/cognitosync/cognitosync.feature → ...ion/smoke/cognitosync/cognitosync.feature b/...ion/smoke/cognitosync/cognitosync.feature → ...ion/smoke/cognitosync/cognitosync.feature
diff --git a/...integration/smoke/configservice/client.go → ...integration/smoke/configservice/client.go b/...integration/smoke/configservice/client.go → ...integration/smoke/configservice/client.go
diff --git a/...smoke/configservice/configservice.feature → ...smoke/configservice/configservice.feature b/...smoke/configservice/configservice.feature → ...smoke/configservice/configservice.feature
diff --git a/.../integration/smoke/datapipeline/client.go → .../integration/smoke/datapipeline/client.go b/.../integration/smoke/datapipeline/client.go → .../integration/smoke/datapipeline/client.go
diff --git a/...n/smoke/datapipeline/datapipeline.feature → ...n/smoke/datapipeline/datapipeline.feature b/...n/smoke/datapipeline/datapipeline.feature → ...n/smoke/datapipeline/datapipeline.feature
diff --git a/...ng/integration/smoke/devicefarm/client.go → ...ng/integration/smoke/devicefarm/client.go b/...ng/integration/smoke/devicefarm/client.go → ...ng/integration/smoke/devicefarm/client.go
diff --git a/...ation/smoke/devicefarm/devicefarm.feature → ...ation/smoke/devicefarm/devicefarm.feature b/...ation/smoke/devicefarm/devicefarm.feature → ...ation/smoke/devicefarm/devicefarm.feature
diff --git a/...integration/smoke/directconnect/client.go → ...integration/smoke/directconnect/client.go b/...integration/smoke/directconnect/client.go → ...integration/smoke/directconnect/client.go
diff --git a/...smoke/directconnect/directconnect.feature → ...smoke/directconnect/directconnect.feature b/...smoke/directconnect/directconnect.feature → ...smoke/directconnect/directconnect.feature
diff --git a/...egration/smoke/directoryservice/client.go → ...egration/smoke/directoryservice/client.go b/...egration/smoke/directoryservice/client.go → ...egration/smoke/directoryservice/client.go
diff --git a/...directoryservice/directoryservice.feature → ...directoryservice/directoryservice.feature b/...directoryservice/directoryservice.feature → ...directoryservice/directoryservice.feature
diff --git a/...ting/integration/smoke/dynamodb/client.go → ...ting/integration/smoke/dynamodb/client.go b/...ting/integration/smoke/dynamodb/client.go → ...ting/integration/smoke/dynamodb/client.go
diff --git a/...tegration/smoke/dynamodb/dynamodb.feature → ...tegration/smoke/dynamodb/dynamodb.feature b/...tegration/smoke/dynamodb/dynamodb.feature → ...tegration/smoke/dynamodb/dynamodb.feature
diff --git a/...tegration/smoke/dynamodbstreams/client.go → ...tegration/smoke/dynamodbstreams/client.go b/...tegration/smoke/dynamodbstreams/client.go → ...tegration/smoke/dynamodbstreams/client.go
diff --git a/...e/dynamodbstreams/dynamodbstreams.feature → ...e/dynamodbstreams/dynamodbstreams.feature b/...e/dynamodbstreams/dynamodbstreams.feature → ...e/dynamodbstreams/dynamodbstreams.feature
diff --git a/awstesting/integration/smoke/ec2/client.go → ...wstesting/integration/smoke/ec2/client.go b/awstesting/integration/smoke/ec2/client.go → ...wstesting/integration/smoke/ec2/client.go
diff --git a/awstesting/integration/smoke/ec2/ec2.feature → ...testing/integration/smoke/ec2/ec2.feature b/awstesting/integration/smoke/ec2/ec2.feature → ...testing/integration/smoke/ec2/ec2.feature
diff --git a/awstesting/integration/smoke/ecs/client.go → ...wstesting/integration/smoke/ecs/client.go b/awstesting/integration/smoke/ecs/client.go → ...wstesting/integration/smoke/ecs/client.go
diff --git a/awstesting/integration/smoke/ecs/ecs.feature → ...testing/integration/smoke/ecs/ecs.feature b/awstesting/integration/smoke/ecs/ecs.feature → ...testing/integration/smoke/ecs/ecs.feature
diff --git a/awstesting/integration/smoke/efs/client.go → ...wstesting/integration/smoke/efs/client.go b/awstesting/integration/smoke/efs/client.go → ...wstesting/integration/smoke/efs/client.go
diff --git a/awstesting/integration/smoke/efs/efs.feature → ...testing/integration/smoke/efs/efs.feature b/awstesting/integration/smoke/efs/efs.feature → ...testing/integration/smoke/efs/efs.feature
diff --git a/...g/integration/smoke/elasticache/client.go → ...g/integration/smoke/elasticache/client.go b/...g/integration/smoke/elasticache/client.go → ...g/integration/smoke/elasticache/client.go
diff --git a/...ion/smoke/elasticache/elasticache.feature → ...ion/smoke/elasticache/elasticache.feature b/...ion/smoke/elasticache/elasticache.feature → ...ion/smoke/elasticache/elasticache.feature
diff --git a/...egration/smoke/elasticbeanstalk/client.go → ...egration/smoke/elasticbeanstalk/client.go b/...egration/smoke/elasticbeanstalk/client.go → ...egration/smoke/elasticbeanstalk/client.go
diff --git a/...elasticbeanstalk/elasticbeanstalk.feature → ...elasticbeanstalk/elasticbeanstalk.feature b/...elasticbeanstalk/elasticbeanstalk.feature → ...elasticbeanstalk/elasticbeanstalk.feature
diff --git a/...tion/smoke/elasticloadbalancing/client.go → ...tion/smoke/elasticloadbalancing/client.go b/...tion/smoke/elasticloadbalancing/client.go → ...tion/smoke/elasticloadbalancing/client.go
diff --git a/...oadbalancing/elasticloadbalancing.feature → ...oadbalancing/elasticloadbalancing.feature b/...oadbalancing/elasticloadbalancing.feature → ...oadbalancing/elasticloadbalancing.feature
diff --git a/...gration/smoke/elastictranscoder/client.go → ...gration/smoke/elastictranscoder/client.go b/...gration/smoke/elastictranscoder/client.go → ...gration/smoke/elastictranscoder/client.go
diff --git a/...astictranscoder/elastictranscoder.feature → ...astictranscoder/elastictranscoder.feature b/...astictranscoder/elastictranscoder.feature → ...astictranscoder/elastictranscoder.feature
diff --git a/awstesting/integration/smoke/emr/client.go → ...wstesting/integration/smoke/emr/client.go b/awstesting/integration/smoke/emr/client.go → ...wstesting/integration/smoke/emr/client.go
diff --git a/awstesting/integration/smoke/emr/emr.feature → ...testing/integration/smoke/emr/emr.feature b/awstesting/integration/smoke/emr/emr.feature → ...testing/integration/smoke/emr/emr.feature
diff --git a/awstesting/integration/smoke/es/client.go → ...awstesting/integration/smoke/es/client.go b/awstesting/integration/smoke/es/client.go → ...awstesting/integration/smoke/es/client.go
diff --git a/awstesting/integration/smoke/es/es.feature → ...wstesting/integration/smoke/es/es.feature b/awstesting/integration/smoke/es/es.feature → ...wstesting/integration/smoke/es/es.feature
diff --git a/...sting/integration/smoke/glacier/client.go → ...sting/integration/smoke/glacier/client.go b/...sting/integration/smoke/glacier/client.go → ...sting/integration/smoke/glacier/client.go
diff --git a/...integration/smoke/glacier/glacier.feature → ...integration/smoke/glacier/glacier.feature b/...integration/smoke/glacier/glacier.feature → ...integration/smoke/glacier/glacier.feature
diff --git a/awstesting/integration/smoke/iam/client.go → ...wstesting/integration/smoke/iam/client.go b/awstesting/integration/smoke/iam/client.go → ...wstesting/integration/smoke/iam/client.go
diff --git a/awstesting/integration/smoke/iam/iam.feature → ...testing/integration/smoke/iam/iam.feature b/awstesting/integration/smoke/iam/iam.feature → ...testing/integration/smoke/iam/iam.feature
diff --git a/.../integration/smoke/iotdataplane/client.go → .../integration/smoke/iotdataplane/client.go b/.../integration/smoke/iotdataplane/client.go → .../integration/smoke/iotdataplane/client.go
diff --git a/...n/smoke/iotdataplane/iotdataplane.feature → ...n/smoke/iotdataplane/iotdataplane.feature b/...n/smoke/iotdataplane/iotdataplane.feature → ...n/smoke/iotdataplane/iotdataplane.feature
diff --git a/...sting/integration/smoke/kinesis/client.go → ...sting/integration/smoke/kinesis/client.go b/...sting/integration/smoke/kinesis/client.go → ...sting/integration/smoke/kinesis/client.go
diff --git a/...integration/smoke/kinesis/kinesis.feature → ...integration/smoke/kinesis/kinesis.feature b/...integration/smoke/kinesis/kinesis.feature → ...integration/smoke/kinesis/kinesis.feature
diff --git a/awstesting/integration/smoke/kms/client.go → ...wstesting/integration/smoke/kms/client.go b/awstesting/integration/smoke/kms/client.go → ...wstesting/integration/smoke/kms/client.go
diff --git a/awstesting/integration/smoke/kms/kms.feature → ...testing/integration/smoke/kms/kms.feature b/awstesting/integration/smoke/kms/kms.feature → ...testing/integration/smoke/kms/kms.feature
diff --git a/...esting/integration/smoke/lambda/client.go → ...esting/integration/smoke/lambda/client.go b/...esting/integration/smoke/lambda/client.go → ...esting/integration/smoke/lambda/client.go
diff --git a/...g/integration/smoke/lambda/lambda.feature → ...g/integration/smoke/lambda/lambda.feature b/...g/integration/smoke/lambda/lambda.feature → ...g/integration/smoke/lambda/lambda.feature
diff --git a/...tegration/smoke/machinelearning/client.go → ...tegration/smoke/machinelearning/client.go b/...tegration/smoke/machinelearning/client.go → ...tegration/smoke/machinelearning/client.go
diff --git a/...e/machinelearning/machinelearning.feature → ...e/machinelearning/machinelearning.feature b/...e/machinelearning/machinelearning.feature → ...e/machinelearning/machinelearning.feature
diff --git a/...ting/integration/smoke/opsworks/client.go → ...ting/integration/smoke/opsworks/client.go b/...ting/integration/smoke/opsworks/client.go → ...ting/integration/smoke/opsworks/client.go
diff --git a/...tegration/smoke/opsworks/opsworks.feature → ...tegration/smoke/opsworks/opsworks.feature b/...tegration/smoke/opsworks/opsworks.feature → ...tegration/smoke/opsworks/opsworks.feature
diff --git a/awstesting/integration/smoke/rds/client.go → ...wstesting/integration/smoke/rds/client.go b/awstesting/integration/smoke/rds/client.go → ...wstesting/integration/smoke/rds/client.go
diff --git a/awstesting/integration/smoke/rds/rds.feature → ...testing/integration/smoke/rds/rds.feature b/awstesting/integration/smoke/rds/rds.feature → ...testing/integration/smoke/rds/rds.feature
diff --git a/...ting/integration/smoke/redshift/client.go → ...ting/integration/smoke/redshift/client.go b/...ting/integration/smoke/redshift/client.go → ...ting/integration/smoke/redshift/client.go
diff --git a/...tegration/smoke/redshift/redshift.feature → ...tegration/smoke/redshift/redshift.feature b/...tegration/smoke/redshift/redshift.feature → ...tegration/smoke/redshift/redshift.feature
diff --git a/...sting/integration/smoke/route53/client.go → ...sting/integration/smoke/route53/client.go b/...sting/integration/smoke/route53/client.go → ...sting/integration/smoke/route53/client.go
diff --git a/...integration/smoke/route53/route53.feature → ...integration/smoke/route53/route53.feature b/...integration/smoke/route53/route53.feature → ...integration/smoke/route53/route53.feature
diff --git a/...ntegration/smoke/route53domains/client.go → ...ntegration/smoke/route53domains/client.go b/...ntegration/smoke/route53domains/client.go → ...ntegration/smoke/route53domains/client.go
diff --git a/...oke/route53domains/route53domains.feature → ...oke/route53domains/route53domains.feature b/...oke/route53domains/route53domains.feature → ...oke/route53domains/route53domains.feature
diff --git a/awstesting/integration/smoke/ses/client.go → ...wstesting/integration/smoke/ses/client.go b/awstesting/integration/smoke/ses/client.go → ...wstesting/integration/smoke/ses/client.go
diff --git a/awstesting/integration/smoke/ses/ses.feature → ...testing/integration/smoke/ses/ses.feature b/awstesting/integration/smoke/ses/ses.feature → ...testing/integration/smoke/ses/ses.feature
diff --git a/awstesting/integration/smoke/shared.go → ...al/awstesting/integration/smoke/shared.go b/awstesting/integration/smoke/shared.go → ...al/awstesting/integration/smoke/shared.go
diff --git a/...ting/integration/smoke/simpledb/client.go → ...ting/integration/smoke/simpledb/client.go b/...ting/integration/smoke/simpledb/client.go → ...ting/integration/smoke/simpledb/client.go
diff --git a/...tegration/smoke/simpledb/simpledb.feature → ...tegration/smoke/simpledb/simpledb.feature b/...tegration/smoke/simpledb/simpledb.feature → ...tegration/smoke/simpledb/simpledb.feature
diff --git a/awstesting/integration/smoke/sns/client.go → ...wstesting/integration/smoke/sns/client.go b/awstesting/integration/smoke/sns/client.go → ...wstesting/integration/smoke/sns/client.go
diff --git a/awstesting/integration/smoke/sns/sns.feature → ...testing/integration/smoke/sns/sns.feature b/awstesting/integration/smoke/sns/sns.feature → ...testing/integration/smoke/sns/sns.feature
diff --git a/awstesting/integration/smoke/sqs/client.go → ...wstesting/integration/smoke/sqs/client.go b/awstesting/integration/smoke/sqs/client.go → ...wstesting/integration/smoke/sqs/client.go
diff --git a/awstesting/integration/smoke/sqs/sqs.feature → ...testing/integration/smoke/sqs/sqs.feature b/awstesting/integration/smoke/sqs/sqs.feature → ...testing/integration/smoke/sqs/sqs.feature
diff --git a/awstesting/integration/smoke/ssm/client.go → ...wstesting/integration/smoke/ssm/client.go b/awstesting/integration/smoke/ssm/client.go → ...wstesting/integration/smoke/ssm/client.go
diff --git a/awstesting/integration/smoke/ssm/ssm.feature → ...testing/integration/smoke/ssm/ssm.feature b/awstesting/integration/smoke/ssm/ssm.feature → ...testing/integration/smoke/ssm/ssm.feature
diff --git a/...ntegration/smoke/storagegateway/client.go → ...ntegration/smoke/storagegateway/client.go b/...ntegration/smoke/storagegateway/client.go → ...ntegration/smoke/storagegateway/client.go
diff --git a/...oke/storagegateway/storagegateway.feature → ...oke/storagegateway/storagegateway.feature b/...oke/storagegateway/storagegateway.feature → ...oke/storagegateway/storagegateway.feature
diff --git a/awstesting/integration/smoke/sts/client.go → ...wstesting/integration/smoke/sts/client.go b/awstesting/integration/smoke/sts/client.go → ...wstesting/integration/smoke/sts/client.go
diff --git a/awstesting/integration/smoke/sts/sts.feature → ...testing/integration/smoke/sts/sts.feature b/awstesting/integration/smoke/sts/sts.feature → ...testing/integration/smoke/sts/sts.feature
diff --git a/...sting/integration/smoke/support/client.go → ...sting/integration/smoke/support/client.go b/...sting/integration/smoke/support/client.go → ...sting/integration/smoke/support/client.go
diff --git a/...integration/smoke/support/support.feature → ...integration/smoke/support/support.feature b/...integration/smoke/support/support.feature → ...integration/smoke/support/support.feature
diff --git a/awstesting/integration/smoke/swf/client.go → ...wstesting/integration/smoke/swf/client.go b/awstesting/integration/smoke/swf/client.go → ...wstesting/integration/smoke/swf/client.go
diff --git a/awstesting/integration/smoke/swf/swf.feature → ...testing/integration/smoke/swf/swf.feature b/awstesting/integration/smoke/swf/swf.feature → ...testing/integration/smoke/swf/swf.feature
diff --git a/awstesting/integration/smoke/waf/client.go → ...wstesting/integration/smoke/waf/client.go b/awstesting/integration/smoke/waf/client.go → ...wstesting/integration/smoke/waf/client.go
diff --git a/awstesting/integration/smoke/waf/waf.feature → ...testing/integration/smoke/waf/waf.feature b/awstesting/integration/smoke/waf/waf.feature → ...testing/integration/smoke/waf/waf.feature
diff --git a/...ng/integration/smoke/workspaces/client.go → ...ng/integration/smoke/workspaces/client.go b/...ng/integration/smoke/workspaces/client.go → ...ng/integration/smoke/workspaces/client.go
diff --git a/...ation/smoke/workspaces/workspaces.feature → ...ation/smoke/workspaces/workspaces.feature b/...ation/smoke/workspaces/workspaces.feature → ...ation/smoke/workspaces/workspaces.feature
diff --git a/awstesting/mock/mock.go → internal/awstesting/mock/mock.go b/awstesting/mock/mock.go → internal/awstesting/mock/mock.go
diff --git a/awstesting/performance/benchmarks.go → ...rnal/awstesting/performance/benchmarks.go b/awstesting/performance/benchmarks.go → ...rnal/awstesting/performance/benchmarks.go
diff --git a/awstesting/performance/client.go → internal/awstesting/performance/client.go b/awstesting/performance/client.go → internal/awstesting/performance/client.go
diff --git a/awstesting/performance/clients.feature → ...al/awstesting/performance/clients.feature b/awstesting/performance/clients.feature → ...al/awstesting/performance/clients.feature
diff --git a/awstesting/performance/clients.go → internal/awstesting/performance/clients.go b/awstesting/performance/clients.go → internal/awstesting/performance/clients.go
diff --git a/awstesting/performance/init.go → internal/awstesting/performance/init.go b/awstesting/performance/init.go → internal/awstesting/performance/init.go
diff --git a/awstesting/performance/logging.go → internal/awstesting/performance/logging.go b/awstesting/performance/logging.go → internal/awstesting/performance/logging.go
diff --git a/awstesting/performance/streaming.feature → .../awstesting/performance/streaming.feature b/awstesting/performance/streaming.feature → .../awstesting/performance/streaming.feature
diff --git a/awstesting/sandbox/Dockerfile.golang-tip → .../awstesting/sandbox/Dockerfile.golang-tip b/awstesting/sandbox/Dockerfile.golang-tip → .../awstesting/sandbox/Dockerfile.golang-tip
diff --git a/awstesting/sandbox/Dockerfile.test.go1.4 → .../awstesting/sandbox/Dockerfile.test.go1.4 b/awstesting/sandbox/Dockerfile.test.go1.4 → .../awstesting/sandbox/Dockerfile.test.go1.4
diff --git a/awstesting/sandbox/Dockerfile.test.go1.5 → .../awstesting/sandbox/Dockerfile.test.go1.5 b/awstesting/sandbox/Dockerfile.test.go1.5 → .../awstesting/sandbox/Dockerfile.test.go1.5
diff --git a/...sandbox/Dockerfile.test.go1.5-novendorexp → ...sandbox/Dockerfile.test.go1.5-novendorexp b/...sandbox/Dockerfile.test.go1.5-novendorexp → ...sandbox/Dockerfile.test.go1.5-novendorexp
diff --git a/awstesting/sandbox/Dockerfile.test.go1.6 → .../awstesting/sandbox/Dockerfile.test.go1.6 b/awstesting/sandbox/Dockerfile.test.go1.6 → .../awstesting/sandbox/Dockerfile.test.go1.6
diff --git a/awstesting/sandbox/Dockerfile.test.go1.7 → .../awstesting/sandbox/Dockerfile.test.go1.7 b/awstesting/sandbox/Dockerfile.test.go1.7 → .../awstesting/sandbox/Dockerfile.test.go1.7
diff --git a/awstesting/sandbox/Dockerfile.test.go1.8 → .../awstesting/sandbox/Dockerfile.test.go1.8 b/awstesting/sandbox/Dockerfile.test.go1.8 → .../awstesting/sandbox/Dockerfile.test.go1.8
diff --git a/awstesting/sandbox/Dockerfile.test.go1.9 → .../awstesting/sandbox/Dockerfile.test.go1.9 b/awstesting/sandbox/Dockerfile.test.go1.9 → .../awstesting/sandbox/Dockerfile.test.go1.9
diff --git a/awstesting/sandbox/Dockerfile.test.gotip → .../awstesting/sandbox/Dockerfile.test.gotip b/awstesting/sandbox/Dockerfile.test.gotip → .../awstesting/sandbox/Dockerfile.test.gotip
diff --git a/awstesting/unit/unit.go → internal/awstesting/unit/unit.go b/awstesting/unit/unit.go → internal/awstesting/unit/unit.go
diff --git a/awstesting/util.go → internal/awstesting/util.go b/awstesting/util.go → internal/awstesting/util.go
diff --git a/awstesting/util_test.go → internal/awstesting/util_test.go b/awstesting/util_test.go → internal/awstesting/util_test.go