Rename gen/ package directory to service/ for consistency

lsegal · lsegal · commit bb796a856c43 · 2015-01-30T15:23:01.000-08:00
diff --git a/Makefile b/Makefile
@@ -4,5 +4,5 @@ install-gen:
 	go install ./cmd/...
 
 generate: install-gen
-	go generate ./gen
-	go install ./gen/...
+	go generate ./service
+	go install ./service/...
diff --git a/README.md b/README.md
@@ -23,13 +23,13 @@ Please do not confuse this for a stable, feature-complete library.
 
 Let's say you want to use EC2:
 
-    $ go get github.com/awslabs/aws-sdk-go/gen/ec2
+    $ go get github.com/awslabs/aws-sdk-go/service/ec2
 
 ## Using
 
 ```go
 import "github.com/awslabs/aws-sdk-go/aws"
-import "github.com/awslabs/aws-sdk-go/gen/ec2"
+import "github.com/awslabs/aws-sdk-go/service/ec2"
 
 creds := aws.Creds(accessKey, secretKey, "")
 cli := ec2.New(creds, "us-west-2", nil)
diff --git a/cmd/aws-gen-gocli/aws-gen-gocli.go b/cmd/aws-gen-gocli/aws-gen-gocli.go
@@ -1,7 +1,7 @@
 // Command aws-gen-gocli parses a JSON description of an AWS API and generates a
 // Go file containing a client for the API.
 //
-//     aws-gen-gocli EC2 apis/ec2/2014-10-01.api.json gen/ec2/ec2.go
+//     aws-gen-gocli EC2 apis/ec2/2014-10-01.api.json service/ec2/ec2.go
 package main
 
 import (
diff --git a/cmd/aws-gen-goendpoints/aws-gen-goendpoints.go b/cmd/aws-gen-goendpoints/aws-gen-goendpoints.go
@@ -1,7 +1,7 @@
 // Command aws-gen-goendpoints parses a JSON description of the AWS endpoint
 // discovery logic and generates a Go file which returns an endpoint.
 //
-//     aws-gen-goendpoints apis/_endpoints.json gen/endpoints/endpoints.go
+//     aws-gen-goendpoints apis/_endpoints.json service/endpoints/endpoints.go
 package main
 
 import (
diff --git a/internal/route53_serialization_test.go b/internal/route53_serialization_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/route53"
+	"github.com/awslabs/aws-sdk-go/service/route53"
 )
 
 func TestRoute53RequestSerialization(t *testing.T) {
diff --git a/internal/unmarshal_xml_test.go b/internal/unmarshal_xml_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/iam"
-	"github.com/awslabs/aws-sdk-go/gen/sqs"
+	"github.com/awslabs/aws-sdk-go/service/iam"
+	"github.com/awslabs/aws-sdk-go/service/sqs"
 )
 
 func Test_SQSUnmarshalXML(t *testing.T) {
diff --git a/service/autoscaling/autoscaling.go b/service/autoscaling/autoscaling.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/cloudformation/cloudformation.go b/service/cloudformation/cloudformation.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/cloudfront/cloudfront.go b/service/cloudfront/cloudfront.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/cloudsearch/cloudsearch.go b/service/cloudsearch/cloudsearch.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/cloudsearchdomain/cloudsearchdomain.go b/service/cloudsearchdomain/cloudsearchdomain.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/cloudtrail/cloudtrail.go b/service/cloudtrail/cloudtrail.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // CloudTrail is a client for AWS CloudTrail.
diff --git a/service/cloudwatch/cloudwatch.go b/service/cloudwatch/cloudwatch.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/codedeploy/codedeploy.go b/service/codedeploy/codedeploy.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // CodeDeploy is a client for AWS CodeDeploy.
diff --git a/service/cognito/identity/identity.go b/service/cognito/identity/identity.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // CognitoIdentity is a client for Amazon Cognito Identity.
diff --git a/service/cognito/sync/sync.go b/service/cognito/sync/sync.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/config/config.go b/service/config/config.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // Config is a client for AWS Config.
diff --git a/service/datapipeline/datapipeline.go b/service/datapipeline/datapipeline.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // DataPipeline is a client for AWS Data Pipeline.
diff --git a/service/directconnect/directconnect.go b/service/directconnect/directconnect.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // DirectConnect is a client for AWS Direct Connect.
diff --git a/service/dynamodb/api.go b/service/dynamodb/api.go
diff --git a/service/dynamodb/integration_test.go b/service/dynamodb/integration_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/dynamodb"
+	"github.com/awslabs/aws-sdk-go/service/dynamodb"
 )
 
 var dynamoDBClient *dynamodb.DynamoDB
diff --git a/service/dynamodb/service.go b/service/dynamodb/service.go
diff --git a/service/ec2/ec2.go b/service/ec2/ec2.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // EC2 is a client for Amazon Elastic Compute Cloud.
diff --git a/service/elasticache/elasticache.go b/service/elasticache/elasticache.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/elasticbeanstalk/elasticbeanstalk.go b/service/elasticbeanstalk/elasticbeanstalk.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/elastictranscoder/elastictranscoder.go b/service/elastictranscoder/elastictranscoder.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/elb/elb.go b/service/elb/elb.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/emr/emr.go b/service/emr/emr.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // EMR is a client for Amazon Elastic MapReduce.
diff --git a/service/endpoints/endpoints.go b/service/endpoints/endpoints.go
diff --git a/service/gen.go b/service/gen.go
@@ -1,5 +1,5 @@
-// Package gen contains automatically generated AWS clients.
-package gen
+// Package service contains automatically generated AWS clients.
+package service
 
 //go:generate ../../../../../bin/aws-gen-goendpoints ../apis/_endpoints.json endpoints/endpoints.go
 //go:generate ../../../../../bin/aws-gen-gocli AutoScaling ../apis/autoscaling/2011-01-01.normal.json autoscaling/autoscaling.go
diff --git a/service/iam/iam.go b/service/iam/iam.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/importexport/importexport.go b/service/importexport/importexport.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/kinesis/kinesis.go b/service/kinesis/kinesis.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // Kinesis is a client for Amazon Kinesis.
diff --git a/service/kms/kms.go b/service/kms/kms.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // KMS is a client for AWS Key Management Service.
diff --git a/service/lambda/api.go b/service/lambda/api.go
diff --git a/service/lambda/service.go b/service/lambda/service.go
diff --git a/service/logs/logs.go b/service/logs/logs.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // Logs is a client for Amazon CloudWatch Logs.
diff --git a/service/opsworks/opsworks.go b/service/opsworks/opsworks.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // OpsWorks is a client for AWS OpsWorks.
diff --git a/service/rds/rds.go b/service/rds/rds.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/redshift/redshift.go b/service/redshift/redshift.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/route53/route53.go b/service/route53/route53.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/route53domains/route53domains.go b/service/route53domains/route53domains.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // Route53Domains is a client for Amazon Route 53 Domains.
diff --git a/service/s3/api.go b/service/s3/api.go
diff --git a/service/s3/service.go b/service/s3/service.go
diff --git a/service/sdb/sdb.go b/service/sdb/sdb.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/ses/ses.go b/service/ses/ses.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/sns/sns.go b/service/sns/sns.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/sqs/integration_test.go b/service/sqs/integration_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/sqs"
+	"github.com/awslabs/aws-sdk-go/service/sqs"
 )
 
 var sqsClient *sqs.SQS
diff --git a/service/sqs/sqs.go b/service/sqs/sqs.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 import (
diff --git a/service/storagegateway/storagegateway.go b/service/storagegateway/storagegateway.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awslabs/aws-sdk-go/aws"
-	"github.com/awslabs/aws-sdk-go/gen/endpoints"
+	"github.com/awslabs/aws-sdk-go/service/endpoints"
 )
 
 // StorageGateway is a client for AWS Storage Gateway.
diff --git a/service/sts/sts.go b/service/sts/sts.go
diff --git a/service/support/support.go b/service/support/support.go
diff --git a/service/swf/swf.go b/service/swf/swf.go

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/awslabs/aws-sdk-go/aws"`
`8`		`- "github.com/awslabs/aws-sdk-go/gen/route53"`
	`8`	`+ "github.com/awslabs/aws-sdk-go/service/route53"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestRoute53RequestSerialization(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"testing"`
`7`	`7`
`8`	`8`	`"github.com/awslabs/aws-sdk-go/aws"`
`9`		`- "github.com/awslabs/aws-sdk-go/gen/iam"`
`10`		`- "github.com/awslabs/aws-sdk-go/gen/sqs"`
	`9`	`+ "github.com/awslabs/aws-sdk-go/service/iam"`
	`10`	`+ "github.com/awslabs/aws-sdk-go/service/sqs"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func Test_SQSUnmarshalXML(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"time"`
`9`	`9`
`10`	`10`	`"github.com/awslabs/aws-sdk-go/aws"`
`11`		`- "github.com/awslabs/aws-sdk-go/gen/endpoints"`
	`11`	`+ "github.com/awslabs/aws-sdk-go/service/endpoints"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"time"`
`10`	`10`
`11`	`11`	`"github.com/awslabs/aws-sdk-go/aws"`
`12`		`- "github.com/awslabs/aws-sdk-go/gen/dynamodb"`
	`12`	`+ "github.com/awslabs/aws-sdk-go/service/dynamodb"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var dynamoDBClient *dynamodb.DynamoDB`