diff --git a/.travis.yml b/.travis.yml index f04dd175..065b3e16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: go go: - 1.2 - - 1.3 - 1.3.3 - 1.4 + - 1.4.1 after_script: - FIXIT=$(go fmt ./...); if [ -n "${FIXIT}" ]; then FIXED=$(echo $FIXIT | wc -l); echo "gofmt - ${FIXED} file(s) not formatted correctly, please run gofmt to fix them:\n ${FIXIT} " && exit 1; fi diff --git a/README.md b/README.md index 5ea570bd..73d0f8f2 100644 --- a/README.md +++ b/README.md @@ -9,31 +9,31 @@ Google group: https://groups.google.com/forum/#!forum/goamz-announcements # GoAMZ -[![Build Status](https://travis-ci.org/crowdmob/goamz.png?branch=master)](https://travis-ci.org/crowdmob/goamz) +[![Build Status](https://travis-ci.org/AdRoll/goamz.png?branch=master)](https://travis-ci.org/AdRoll/goamz) The _goamz_ package enables Go programs to interact with Amazon Web Services. -This is a fork of the version [developed within Canonical](https://wiki.ubuntu.com/goamz) with additional functionality and services from [a number of contributors](https://github.com/crowdmob/goamz/contributors)! +This is a fork of the version [developed within Canonical](https://wiki.ubuntu.com/goamz) with additional functionality and services from [a number of contributors](https://github.com/AdRoll/goamz/contributors)! The API of AWS is very comprehensive, though, and goamz doesn't even scratch the surface of it. That said, it's fairly well tested, and is the foundation in which further calls can easily be integrated. We'll continue extending the API as necessary - Pull Requests are _very_ welcome! The following packages are available at the moment: ``` -github.com/crowdmob/goamz/aws -github.com/crowdmob/goamz/cloudwatch -github.com/crowdmob/goamz/dynamodb -github.com/crowdmob/goamz/ec2 -github.com/crowdmob/goamz/elb -github.com/crowdmob/goamz/iam -github.com/crowdmob/goamz/kinesis -github.com/crowdmob/goamz/s3 -github.com/crowdmob/goamz/sqs -github.com/crowdmob/goamz/sns - -github.com/crowdmob/goamz/exp/mturk -github.com/crowdmob/goamz/exp/sdb -github.com/crowdmob/goamz/exp/ses +github.com/AdRoll/goamz/aws +github.com/AdRoll/goamz/cloudwatch +github.com/AdRoll/goamz/dynamodb +github.com/AdRoll/goamz/ec2 +github.com/AdRoll/goamz/elb +github.com/AdRoll/goamz/iam +github.com/AdRoll/goamz/kinesis +github.com/AdRoll/goamz/s3 +github.com/AdRoll/goamz/sqs +github.com/AdRoll/goamz/sns + +github.com/AdRoll/goamz/exp/mturk +github.com/AdRoll/goamz/exp/sdb +github.com/AdRoll/goamz/exp/ses ``` Packages under `exp/` are still in an experimental or unfinished/unpolished state. @@ -42,14 +42,14 @@ Packages under `exp/` are still in an experimental or unfinished/unpolished stat The API documentation is currently available at: -[http://godoc.org/github.com/crowdmob/goamz](http://godoc.org/github.com/crowdmob/goamz) +[http://godoc.org/github.com/AdRoll/goamz](http://godoc.org/github.com/AdRoll/goamz) ## How to build and install goamz Just use `go get` with any of the available packages. For example: -* `$ go get github.com/crowdmob/goamz/ec2` -* `$ go get github.com/crowdmob/goamz/s3` +* `$ go get github.com/AdRoll/goamz/ec2` +* `$ go get github.com/AdRoll/goamz/s3` ## Running tests @@ -59,7 +59,7 @@ To run tests, first install gocheck with: Then run go test as usual: -`$ go test github.com/crowdmob/goamz/...` +`$ go test github.com/AdRoll/goamz/...` _Note:_ running all tests with the command `go test ./...` will currently fail as tests do not tear down their HTTP listeners. diff --git a/autoscaling/autoscaling.go b/autoscaling/autoscaling.go index 5b5636aa..4307ef33 100644 --- a/autoscaling/autoscaling.go +++ b/autoscaling/autoscaling.go @@ -3,7 +3,7 @@ package autoscaling import ( "encoding/xml" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "log" "net/http" "net/http/httputil" diff --git a/autoscaling/autoscaling_test.go b/autoscaling/autoscaling_test.go index e7cc6c96..f37fcc39 100644 --- a/autoscaling/autoscaling_test.go +++ b/autoscaling/autoscaling_test.go @@ -1,8 +1,8 @@ package autoscaling import ( - "github.com/crowdmob/goamz/autoscaling/astest" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/autoscaling/astest" + "github.com/AdRoll/goamz/aws" "testing" ) diff --git a/autoscaling/sign.go b/autoscaling/sign.go index 8f6fc055..a4c7994c 100644 --- a/autoscaling/sign.go +++ b/autoscaling/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "sort" "strings" ) diff --git a/aws/attempt_test.go b/aws/attempt_test.go index c83b185e..a6a0afc9 100644 --- a/aws/attempt_test.go +++ b/aws/attempt_test.go @@ -1,7 +1,7 @@ package aws_test import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "time" ) diff --git a/aws/aws_test.go b/aws/aws_test.go index e1e68674..0577f5c8 100644 --- a/aws/aws_test.go +++ b/aws/aws_test.go @@ -1,7 +1,7 @@ package aws_test import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "io/ioutil" "os" diff --git a/aws/sign_test.go b/aws/sign_test.go index d172bdb6..0f01bce3 100644 --- a/aws/sign_test.go +++ b/aws/sign_test.go @@ -2,7 +2,7 @@ package aws_test import ( "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "net/http" "strings" diff --git a/cloudfront/cloudfront.go b/cloudfront/cloudfront.go index c13bbeec..b845d3c5 100644 --- a/cloudfront/cloudfront.go +++ b/cloudfront/cloudfront.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/url" "strconv" "strings" diff --git a/cloudwatch/README.md b/cloudwatch/README.md index 7333e858..9dd076d3 100644 --- a/cloudwatch/README.md +++ b/cloudwatch/README.md @@ -1,7 +1,7 @@ #GoLang AWS Cloudwatch ## Installation -Please refer to the project's main page at [https://github.com/crowdmob/goamz](https://github.com/crowdmob/goamz) for instructions about how to install. +Please refer to the project's main page at [https://github.com/AdRoll/goamz](https://github.com/AdRoll/goamz) for instructions about how to install. ## Available methods @@ -30,8 +30,8 @@ import ( "fmt" "time" "os" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/cloudwatch" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/cloudwatch" ) func test_get_metric_statistics() { @@ -78,8 +78,8 @@ import ( "fmt" "time" "os" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/cloudwatch" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/cloudwatch" ) func test_list_metrics() { diff --git a/cloudwatch/cloudwatch.go b/cloudwatch/cloudwatch.go index 280edd7b..cccf1f4b 100644 --- a/cloudwatch/cloudwatch.go +++ b/cloudwatch/cloudwatch.go @@ -18,7 +18,7 @@ import ( "encoding/xml" "errors" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "github.com/feyeleanor/sets" "strconv" "time" diff --git a/cloudwatch/cloudwatch_test.go b/cloudwatch/cloudwatch_test.go index 38e4459e..83f52ecc 100644 --- a/cloudwatch/cloudwatch_test.go +++ b/cloudwatch/cloudwatch_test.go @@ -1,9 +1,9 @@ package cloudwatch_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/cloudwatch" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/cloudwatch" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "testing" ) diff --git a/dynamodb/dynamo_query_builder.go b/dynamodb/dynamo_query_builder.go index 896ca344..1ae42b9b 100644 --- a/dynamodb/dynamo_query_builder.go +++ b/dynamodb/dynamo_query_builder.go @@ -3,7 +3,7 @@ package dynamodb import ( "encoding/json" "errors" - "github.com/crowdmob/goamz/dynamodb/dynamizer" + "github.com/AdRoll/goamz/dynamodb/dynamizer" ) type DynamoQuery struct { diff --git a/dynamodb/dynamo_query_builder_test.go b/dynamodb/dynamo_query_builder_test.go index cd64b564..53436e54 100644 --- a/dynamodb/dynamo_query_builder_test.go +++ b/dynamodb/dynamo_query_builder_test.go @@ -3,8 +3,8 @@ package dynamodb import ( "bytes" "encoding/json" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/dynamodb/dynamizer" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/dynamodb/dynamizer" "reflect" "testing" ) diff --git a/dynamodb/dynamodb.go b/dynamodb/dynamodb.go index 1e0896c1..ea71f02c 100755 --- a/dynamodb/dynamodb.go +++ b/dynamodb/dynamodb.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) type Server struct { diff --git a/dynamodb/dynamodb_test.go b/dynamodb/dynamodb_test.go index fb5d3757..ca1c03c5 100755 --- a/dynamodb/dynamodb_test.go +++ b/dynamodb/dynamodb_test.go @@ -2,7 +2,7 @@ package dynamodb import ( "flag" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "testing" "time" diff --git a/dynamodb/item.go b/dynamodb/item.go index 63acb496..cfb1e762 100755 --- a/dynamodb/item.go +++ b/dynamodb/item.go @@ -4,8 +4,8 @@ import ( "encoding/json" "errors" "fmt" + "github.com/AdRoll/goamz/dynamodb/dynamizer" simplejson "github.com/bitly/go-simplejson" - "github.com/crowdmob/goamz/dynamodb/dynamizer" "log" ) diff --git a/dynamodb/query_builder_test.go b/dynamodb/query_builder_test.go index 1c71fd5e..61560c78 100755 --- a/dynamodb/query_builder_test.go +++ b/dynamodb/query_builder_test.go @@ -1,8 +1,8 @@ package dynamodb import ( + "github.com/AdRoll/goamz/aws" simplejson "github.com/bitly/go-simplejson" - "github.com/crowdmob/goamz/aws" "gopkg.in/check.v1" ) diff --git a/dynamodb/retry_test.go b/dynamodb/retry_test.go index bc477912..d7452553 100644 --- a/dynamodb/retry_test.go +++ b/dynamodb/retry_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) type RetrySuite struct { diff --git a/ec2/ec2.go b/ec2/ec2.go index 3a285006..47f964d9 100644 --- a/ec2/ec2.go +++ b/ec2/ec2.go @@ -15,7 +15,7 @@ import ( "encoding/hex" "encoding/xml" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "log" "net/http" "net/http/httputil" @@ -1104,10 +1104,13 @@ type CreateSecurityGroupResp struct { // name and description. // // See http://goo.gl/Eo7Yl for more details. -func (ec2 *EC2) CreateSecurityGroup(name, description string) (resp *CreateSecurityGroupResp, err error) { +func (ec2 *EC2) CreateSecurityGroup(name, description string, VpcId string) (resp *CreateSecurityGroupResp, err error) { params := makeParams("CreateSecurityGroup") params["GroupName"] = name params["GroupDescription"] = description + if VpcId != "" { + params["VpcId"] = VpcId + } resp = &CreateSecurityGroupResp{} err = ec2.query(params, resp) @@ -1497,6 +1500,8 @@ type DescribeInstanceStatusResponse struct { InstanceStatuses []InstanceStatus `xml:"instanceStatusSet>item"` } +// Describes the status of one or more instances, including any scheduled events. +// See http://goo.gl/XNBn3G func (ec2 *EC2) DescribeInstanceStatus(instIds []string, filter *Filter) (resp *DescribeInstanceStatusResponse, err error) { params := makeParams("DescribeInstanceStatus") addParamsList(params, "InstanceId", instIds) @@ -1535,9 +1540,14 @@ type DescribeVolumesResp struct { Volumes []VolumeStruct `xml:"volumeSet>item"` } +// Describes the specified Amazon EBS volumes. +// See http://goo.gl/7a7LWz func (ec2 *EC2) DescribeVolumes(volIds []string, filter *Filter) (resp *DescribeVolumesResp, err error) { params := makeParams("DescribeVolumes") addParamsList(params, "VolumeId", volIds) + for i, id := range volIds { + params["VolumeId."+strconv.Itoa(i+1)] = id + } filter.addParams(params) resp = &DescribeVolumesResp{} err = ec2.query(params, resp) @@ -1556,6 +1566,8 @@ type AttachVolumeResp struct { AttachTime string `xml:"attachTime"` } +// Attaches an Amazon EBS volume to a running or stopped instance and exposes it to the instance with the specified device name. +// See http://goo.gl/lWT1EL func (ec2 *EC2) AttachVolume(volId string, InstId string, devName string) (resp *AttachVolumeResp, err error) { params := makeParams("AttachVolume") params["VolumeId"] = volId @@ -1642,9 +1654,13 @@ type DescribeVpcsResp struct { Vpcs []VpcStruct `xml:"vpcSet>item"` } +// Describes one or more of your VPCs. +// See http://goo.gl/ur2dwp func (ec2 *EC2) DescribeVpcs(vpcIds []string, filter *Filter) (resp *DescribeVpcsResp, err error) { params := makeParams("DescribeVpcs") - addParamsList(params, "vpcId", vpcIds) + for i, id := range vpcIds { + params["vpcId."+strconv.Itoa(i+1)] = id + } filter.addParams(params) resp = &DescribeVpcsResp{} err = ec2.query(params, resp) @@ -1667,9 +1683,13 @@ type DescribeVpnConnectionsResp struct { VpnConnections []VpnConnectionStruct `xml:"vpnConnectionSet>item"` } +// Describes one or more of your VPN connections. +// See http://goo.gl/3HPKpS func (ec2 *EC2) DescribeVpnConnections(VpnConnectionIds []string, filter *Filter) (resp *DescribeVpnConnectionsResp, err error) { params := makeParams("DescribeVpnConnections") - addParamsList(params, "VpnConnectionId", VpnConnectionIds) + for i, id := range VpnConnectionIds { + params["VpnConnectionId."+strconv.Itoa(i+1)] = id + } filter.addParams(params) resp = &DescribeVpnConnectionsResp{} err = ec2.query(params, resp) @@ -1693,9 +1713,13 @@ type DescribeVpnGatewaysResp struct { VpnGateway []VpnGatewayStruct `xml:"vpnGatewaySet>item"` } +// Describes one or more of your virtual private gateways. +// See http://goo.gl/JTJgbY func (ec2 *EC2) DescribeVpnGateways(VpnGatewayIds []string, filter *Filter) (resp *DescribeVpnGatewaysResp, err error) { params := makeParams("DescribeVpnGateways") - addParamsList(params, "VpnGatewayIds", VpnGatewayIds) + for i, id := range VpnGatewayIds { + params["VpnGatewayId."+strconv.Itoa(i+1)] = id + } filter.addParams(params) resp = &DescribeVpnGatewaysResp{} if err = ec2.query(params, resp); err != nil { @@ -1715,9 +1739,13 @@ type DescribeInternetGatewaysResp struct { InternetGateway []InternetGatewayStruct `xml:"internetGatewaySet>item"` } +// Describes one or more of your Internet gateways +// http://goo.gl/QR2DiZ func (ec2 *EC2) DescribeInternetGateways(InternetGatewayIds []string, filter *Filter) (resp *DescribeInternetGatewaysResp, err error) { params := makeParams("DescribeInternetGateways") - addParamsList(params, "InternetGatewayId", InternetGatewayIds) + for i, id := range InternetGatewayIds { + params["InternetGatewayId."+strconv.Itoa(i+1)] = id + } filter.addParams(params) resp = &DescribeInternetGatewaysResp{} if err = ec2.query(params, resp); err != nil { @@ -1725,3 +1753,28 @@ func (ec2 *EC2) DescribeInternetGateways(InternetGatewayIds []string, filter *Fi } return resp, err } + +type AttributeSet struct { + AttributeName string `xml:"attributeName"` + AttributeValue []string `xml:"attributeValueSet>item>attributeValue"` +} + +type DescribeAccountAttributeResp struct { + RequestId string `xml:"requestId"` + AttributeList []AttributeSet `xml:"accountAttributeSet>item"` +} + +// Describes attributes of your AWS account. +// http://goo.gl/xj7YGT +func (ec2 *EC2) DescribeAccountAttributes(AttributeNames []string, filter *Filter) (resp *DescribeAccountAttributeResp, err error) { + params := makeParams("DescribeAccountAttributes") + for i, AttrName := range AttributeNames { + params["AttributeName."+strconv.Itoa(i+1)] = AttrName + } + filter.addParams(params) + resp = &DescribeAccountAttributeResp{} + if err = ec2.query(params, resp); err != nil { + return nil, err + } + return resp, err +} diff --git a/ec2/ec2_test.go b/ec2/ec2_test.go index f642f736..cf2cb441 100644 --- a/ec2/ec2_test.go +++ b/ec2/ec2_test.go @@ -1,9 +1,9 @@ package ec2_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/ec2" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/ec2" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "testing" ) @@ -570,12 +570,13 @@ func (s *S) TestDescribeSubnetsExample(c *check.C) { func (s *S) TestCreateSecurityGroupExample(c *check.C) { testServer.Response(200, nil, CreateSecurityGroupExample) - resp, err := s.ec2.CreateSecurityGroup("websrv", "Web Servers") + resp, err := s.ec2.CreateSecurityGroup("websrv", "Web Servers", "") req := testServer.WaitRequest() c.Assert(req.Form["Action"], check.DeepEquals, []string{"CreateSecurityGroup"}) c.Assert(req.Form["GroupName"], check.DeepEquals, []string{"websrv"}) c.Assert(req.Form["GroupDescription"], check.DeepEquals, []string{"Web Servers"}) + c.Assert(req.Form["VpcId"], check.DeepEquals, []string(nil)) c.Assert(err, check.IsNil) c.Assert(resp.RequestId, check.Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE") @@ -1156,3 +1157,38 @@ func (s *S) TestDescribeInternetGateways(c *check.C) { c.Assert(g0.AttachedVpcId, check.Equals, "vpc-11ad4878") c.Assert(g0.AttachState, check.Equals, "available") } + +func (s *S) TestDescribeAccountAttriutes(c *check.C) { + testServer.Response(200, nil, DescribeAccountAttributesExample) + + resp, err := s.ec2.DescribeAccountAttributes([]string{"supported-platforms"}, nil) + + req := testServer.WaitRequest() + + c.Assert(req.Form["Action"], check.DeepEquals, []string{"DescribeAccountAttributes"}) + c.Assert(err, check.IsNil) + c.Assert(resp.RequestId, check.Equals, "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE") + c.Assert(resp.AttributeList, check.HasLen, 1) + a0 := resp.AttributeList[0] + c.Assert(a0.AttributeName, check.Equals, "supported-platforms") + v0 := a0.AttributeValue[0] + v1 := a0.AttributeValue[1] + c.Assert(v0, check.Equals, "EC2") + c.Assert(v1, check.Equals, "VPC") +} +func (s *S) TestCreateSecurityGroupVpcExample(c *check.C) { + testServer.Response(200, nil, CreateSecurityGroupVpcExample) + + resp, err := s.ec2.CreateSecurityGroup("WebServerSG", "Web Servers", "vpc-3325caf2") + + req := testServer.WaitRequest() + c.Assert(req.Form["Action"], check.DeepEquals, []string{"CreateSecurityGroup"}) + c.Assert(req.Form["GroupName"], check.DeepEquals, []string{"WebServerSG"}) + c.Assert(req.Form["GroupDescription"], check.DeepEquals, []string{"Web Servers"}) + c.Assert(req.Form["VpcId"], check.DeepEquals, []string{"vpc-3325caf2"}) + + c.Assert(err, check.IsNil) + c.Assert(resp.RequestId, check.Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE") + c.Assert(resp.Name, check.Equals, "WebServerSG") + c.Assert(resp.Id, check.Equals, "sg-0a42d66a") +} diff --git a/ec2/ec2i_test.go b/ec2/ec2i_test.go index cc53deaa..6bb69a7a 100644 --- a/ec2/ec2i_test.go +++ b/ec2/ec2i_test.go @@ -3,9 +3,9 @@ package ec2_test import ( "crypto/rand" "fmt" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/ec2" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/ec2" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" ) @@ -107,13 +107,13 @@ func (s *ClientTests) TestSecurityGroups(c *check.C) { s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name}) defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name}) - resp1, err := s.ec2.CreateSecurityGroup(name, descr) + resp1, err := s.ec2.CreateSecurityGroup(name, descr, "") c.Assert(err, check.IsNil) c.Assert(resp1.RequestId, check.Matches, ".+") c.Assert(resp1.Name, check.Equals, name) c.Assert(resp1.Id, check.Matches, ".+") - resp1, err = s.ec2.CreateSecurityGroup(name, descr) + resp1, err = s.ec2.CreateSecurityGroup(name, descr, "") ec2err, _ := err.(*ec2.Error) c.Assert(resp1, check.IsNil) c.Assert(ec2err, check.NotNil) diff --git a/ec2/ec2t_test.go b/ec2/ec2t_test.go index cc6622d6..009cc600 100644 --- a/ec2/ec2t_test.go +++ b/ec2/ec2t_test.go @@ -2,10 +2,10 @@ package ec2_test import ( "fmt" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/ec2" - "github.com/crowdmob/goamz/ec2/ec2test" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/ec2" + "github.com/AdRoll/goamz/ec2/ec2test" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "regexp" "sort" @@ -122,7 +122,7 @@ func (s *ServerTests) makeTestGroup(c *check.C, name, descr string) ec2.Security c.Fatalf("delete security group: %v", err) } - resp, err := s.ec2.CreateSecurityGroup(name, descr) + resp, err := s.ec2.CreateSecurityGroup(name, descr, "") c.Assert(err, check.IsNil) c.Assert(resp.Name, check.Equals, name) return resp.SecurityGroup @@ -250,7 +250,7 @@ func (s *ServerTests) TestDuplicateIPPerm(c *check.C) { s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name}) defer s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: name}) - resp1, err := s.ec2.CreateSecurityGroup(name, descr) + resp1, err := s.ec2.CreateSecurityGroup(name, descr, "") c.Assert(err, check.IsNil) c.Assert(resp1.Name, check.Equals, name) @@ -279,12 +279,12 @@ type filterSpec struct { } func (s *ServerTests) TestInstanceFiltering(c *check.C) { - groupResp, err := s.ec2.CreateSecurityGroup(sessionName("testgroup1"), "testgroup one description") + groupResp, err := s.ec2.CreateSecurityGroup(sessionName("testgroup1"), "testgroup one description", "") c.Assert(err, check.IsNil) group1 := groupResp.SecurityGroup defer s.ec2.DeleteSecurityGroup(group1) - groupResp, err = s.ec2.CreateSecurityGroup(sessionName("testgroup2"), "testgroup two description") + groupResp, err = s.ec2.CreateSecurityGroup(sessionName("testgroup2"), "testgroup two description", "") c.Assert(err, check.IsNil) group2 := groupResp.SecurityGroup defer s.ec2.DeleteSecurityGroup(group2) @@ -437,7 +437,7 @@ func namesOnly(gs []ec2.SecurityGroup) []ec2.SecurityGroup { func (s *ServerTests) TestGroupFiltering(c *check.C) { g := make([]ec2.SecurityGroup, 4) for i := range g { - resp, err := s.ec2.CreateSecurityGroup(sessionName(fmt.Sprintf("testgroup%d", i)), fmt.Sprintf("testdescription%d", i)) + resp, err := s.ec2.CreateSecurityGroup(sessionName(fmt.Sprintf("testgroup%d", i)), fmt.Sprintf("testdescription%d", i), "") c.Assert(err, check.IsNil) g[i] = resp.SecurityGroup c.Logf("group %d: %v", i, g[i]) diff --git a/ec2/ec2test/server.go b/ec2/ec2test/server.go index 142fa6c4..3cbc1bdc 100644 --- a/ec2/ec2test/server.go +++ b/ec2/ec2test/server.go @@ -8,7 +8,7 @@ import ( "encoding/base64" "encoding/xml" "fmt" - "github.com/crowdmob/goamz/ec2" + "github.com/AdRoll/goamz/ec2" "io" "net" "net/http" diff --git a/ec2/export_test.go b/ec2/export_test.go index 8e1a88f7..ed017732 100644 --- a/ec2/export_test.go +++ b/ec2/export_test.go @@ -1,7 +1,7 @@ package ec2 import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "time" ) diff --git a/ec2/responses_test.go b/ec2/responses_test.go index 82d46563..76b30d30 100644 --- a/ec2/responses_test.go +++ b/ec2/responses_test.go @@ -1142,5 +1142,32 @@ var ( +` + + DescribeAccountAttributesExample = ` + + 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE + + + supported-platforms + + + EC2 + + + VPC + + + + + +` + + CreateSecurityGroupVpcExample = ` + + 59dbff89-35bd-4eac-99ed-be587EXAMPLE + true + sg-0a42d66a + ` ) diff --git a/ec2/sign.go b/ec2/sign.go index 4c604c0d..b1066a8e 100644 --- a/ec2/sign.go +++ b/ec2/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "sort" "strings" ) diff --git a/ec2/sign_test.go b/ec2/sign_test.go index e0c02d9b..732cf9be 100644 --- a/ec2/sign_test.go +++ b/ec2/sign_test.go @@ -1,8 +1,8 @@ package ec2_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/ec2" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/ec2" "gopkg.in/check.v1" ) diff --git a/ecommerce/ecommerce.go b/ecommerce/ecommerce.go index be413484..7e665929 100644 --- a/ecommerce/ecommerce.go +++ b/ecommerce/ecommerce.go @@ -3,7 +3,7 @@ package ecommerce import ( "net/http" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) // ProductAdvertising provides methods for querying the product advertising API diff --git a/elasticache/elasticache.go b/elasticache/elasticache.go index f01fca3a..3bad7f93 100644 --- a/elasticache/elasticache.go +++ b/elasticache/elasticache.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) var ( diff --git a/elasticache/elasticache_test.go b/elasticache/elasticache_test.go index cf9da546..56ccf4ae 100644 --- a/elasticache/elasticache_test.go +++ b/elasticache/elasticache_test.go @@ -3,8 +3,8 @@ package elasticache import ( "testing" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/testutil" check "gopkg.in/check.v1" ) diff --git a/elb/elb.go b/elb/elb.go index 65aa0a4e..147bac7a 100644 --- a/elb/elb.go +++ b/elb/elb.go @@ -4,7 +4,7 @@ package elb import ( "encoding/xml" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/http" "net/url" "strconv" diff --git a/elb/elb_test.go b/elb/elb_test.go index 6ef4f11c..3a4c316b 100644 --- a/elb/elb_test.go +++ b/elb/elb_test.go @@ -1,8 +1,8 @@ package elb_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/elb" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/elb" "gopkg.in/check.v1" "time" ) diff --git a/elb/elbi_test.go b/elb/elbi_test.go index ee719b0c..b0d75e1e 100644 --- a/elb/elbi_test.go +++ b/elb/elbi_test.go @@ -2,9 +2,9 @@ package elb_test import ( "flag" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/ec2" - "github.com/crowdmob/goamz/elb" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/ec2" + "github.com/AdRoll/goamz/elb" "gopkg.in/check.v1" ) diff --git a/elb/elbt_test.go b/elb/elbt_test.go index 9a6bf543..37806448 100644 --- a/elb/elbt_test.go +++ b/elb/elbt_test.go @@ -1,9 +1,9 @@ package elb_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/elb" - "github.com/crowdmob/goamz/elb/elbtest" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/elb" + "github.com/AdRoll/goamz/elb/elbtest" "gopkg.in/check.v1" ) diff --git a/elb/elbtest/server.go b/elb/elbtest/server.go index b05a6c4f..636f34d3 100644 --- a/elb/elbtest/server.go +++ b/elb/elbtest/server.go @@ -6,7 +6,7 @@ package elbtest import ( "encoding/xml" "fmt" - "github.com/crowdmob/goamz/elb" + "github.com/AdRoll/goamz/elb" "net" "net/http" "net/url" diff --git a/exp/mturk/example_test.go b/exp/mturk/example_test.go index 5345b164..14b85481 100644 --- a/exp/mturk/example_test.go +++ b/exp/mturk/example_test.go @@ -2,8 +2,8 @@ package mturk_test import ( "fmt" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/mturk" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/mturk" ) var turk *mturk.MTurk diff --git a/exp/mturk/export_test.go b/exp/mturk/export_test.go index 89ec653b..ceca9ff3 100644 --- a/exp/mturk/export_test.go +++ b/exp/mturk/export_test.go @@ -1,7 +1,7 @@ package mturk import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) func Sign(auth aws.Auth, service, method, timestamp string, params map[string]string) { diff --git a/exp/mturk/mturk.go b/exp/mturk/mturk.go index e9b50c53..f8144b5e 100644 --- a/exp/mturk/mturk.go +++ b/exp/mturk/mturk.go @@ -17,7 +17,7 @@ import ( "encoding/xml" "errors" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/http" //"net/http/httputil" "net/url" diff --git a/exp/mturk/mturk_test.go b/exp/mturk/mturk_test.go index e6d99534..19bfd8ba 100644 --- a/exp/mturk/mturk_test.go +++ b/exp/mturk/mturk_test.go @@ -1,9 +1,9 @@ package mturk_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/mturk" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/mturk" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "net/url" "testing" diff --git a/exp/mturk/sign.go b/exp/mturk/sign.go index af125041..51375a84 100644 --- a/exp/mturk/sign.go +++ b/exp/mturk/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha1" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) var b64 = base64.StdEncoding diff --git a/exp/mturk/sign_test.go b/exp/mturk/sign_test.go index 7486a13a..2ab3480b 100644 --- a/exp/mturk/sign_test.go +++ b/exp/mturk/sign_test.go @@ -1,8 +1,8 @@ package mturk_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/mturk" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/mturk" "gopkg.in/check.v1" ) diff --git a/exp/sdb/export_test.go b/exp/sdb/export_test.go index 3156a90d..2b4502d1 100644 --- a/exp/sdb/export_test.go +++ b/exp/sdb/export_test.go @@ -1,7 +1,7 @@ package sdb import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) func Sign(auth aws.Auth, method, path string, params map[string][]string, headers map[string][]string) { diff --git a/exp/sdb/sdb.go b/exp/sdb/sdb.go index f3a9cb0d..622ed3fc 100644 --- a/exp/sdb/sdb.go +++ b/exp/sdb/sdb.go @@ -22,7 +22,7 @@ package sdb import ( "encoding/xml" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "log" "net/http" "net/http/httputil" diff --git a/exp/sdb/sdb_test.go b/exp/sdb/sdb_test.go index 2e6c1111..ea261829 100644 --- a/exp/sdb/sdb_test.go +++ b/exp/sdb/sdb_test.go @@ -1,9 +1,9 @@ package sdb_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/sdb" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/sdb" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "testing" ) diff --git a/exp/sdb/sign.go b/exp/sdb/sign.go index 0fd27d26..f5dcb9e3 100644 --- a/exp/sdb/sign.go +++ b/exp/sdb/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/http" "net/url" "sort" diff --git a/exp/sdb/sign_test.go b/exp/sdb/sign_test.go index 8d616e0f..cb0dded8 100644 --- a/exp/sdb/sign_test.go +++ b/exp/sdb/sign_test.go @@ -1,8 +1,8 @@ package sdb_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/sdb" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/sdb" "gopkg.in/check.v1" ) diff --git a/exp/ses/delivery_notification_test.go b/exp/ses/delivery_notification_test.go index c4e35f46..fdc0700e 100644 --- a/exp/ses/delivery_notification_test.go +++ b/exp/ses/delivery_notification_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "gopkg.in/check.v1" - "github.com/crowdmob/goamz/exp/ses" + "github.com/AdRoll/goamz/exp/ses" ) func (s *S) TestSNSBounceNotificationUnmarshalling(c *check.C) { diff --git a/exp/ses/ses.go b/exp/ses/ses.go index 9c116aeb..ab51fb26 100644 --- a/exp/ses/ses.go +++ b/exp/ses/ses.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) const MAX_RECIPIENTS_PER_REQUEST = 50 diff --git a/exp/ses/ses_test.go b/exp/ses/ses_test.go index 580930ae..713c04d1 100644 --- a/exp/ses/ses_test.go +++ b/exp/ses/ses_test.go @@ -4,9 +4,9 @@ import ( "gopkg.in/check.v1" "testing" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/exp/ses" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/exp/ses" + "github.com/AdRoll/goamz/testutil" ) func Test(t *testing.T) { diff --git a/iam/iam.go b/iam/iam.go index cbcadd17..d097cd54 100644 --- a/iam/iam.go +++ b/iam/iam.go @@ -4,7 +4,7 @@ package iam import ( "encoding/xml" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/http" "net/url" "strconv" diff --git a/iam/iam_test.go b/iam/iam_test.go index 66099b82..a15f9c6a 100644 --- a/iam/iam_test.go +++ b/iam/iam_test.go @@ -1,9 +1,9 @@ package iam_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/iam" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/iam" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "strings" "testing" diff --git a/iam/iami_test.go b/iam/iami_test.go index 5f2b1424..cbc82f31 100644 --- a/iam/iami_test.go +++ b/iam/iami_test.go @@ -1,9 +1,9 @@ package iam_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/iam" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/iam" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "net/url" ) diff --git a/iam/iamt_test.go b/iam/iamt_test.go index 64225b9e..37892254 100644 --- a/iam/iamt_test.go +++ b/iam/iamt_test.go @@ -1,9 +1,9 @@ package iam_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/iam" - "github.com/crowdmob/goamz/iam/iamtest" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/iam" + "github.com/AdRoll/goamz/iam/iamtest" "gopkg.in/check.v1" ) diff --git a/iam/iamtest/server.go b/iam/iamtest/server.go index 69b41bea..7fd6e4a5 100644 --- a/iam/iamtest/server.go +++ b/iam/iamtest/server.go @@ -7,7 +7,7 @@ import ( "encoding/json" "encoding/xml" "fmt" - "github.com/crowdmob/goamz/iam" + "github.com/AdRoll/goamz/iam" "net" "net/http" "strings" diff --git a/iam/sign.go b/iam/sign.go index a2875df7..dddf72c4 100644 --- a/iam/sign.go +++ b/iam/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "sort" "strings" ) diff --git a/kinesis/kinesis.go b/kinesis/kinesis.go index d8402a00..99170d07 100644 --- a/kinesis/kinesis.go +++ b/kinesis/kinesis.go @@ -2,7 +2,7 @@ package kinesis import ( "encoding/json" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "io/ioutil" "log" "net/http" diff --git a/kinesis/kinesis_test.go b/kinesis/kinesis_test.go index 062b2495..dee96206 100644 --- a/kinesis/kinesis_test.go +++ b/kinesis/kinesis_test.go @@ -10,7 +10,7 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/crowdmob/goamz/kinesis" + "github.com/AdRoll/goamz/kinesis" "path/filepath" "reflect" "runtime" diff --git a/kinesis/types.go b/kinesis/types.go index b2105479..c13c0bbe 100644 --- a/kinesis/types.go +++ b/kinesis/types.go @@ -2,7 +2,7 @@ package kinesis import ( "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) type ShardIteratorType string diff --git a/rds/rds.go b/rds/rds.go index da56cf8c..fa36e3c7 100644 --- a/rds/rds.go +++ b/rds/rds.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) const debug = false diff --git a/rds/rds_test.go b/rds/rds_test.go index a1e4793b..3cec5632 100644 --- a/rds/rds_test.go +++ b/rds/rds_test.go @@ -1,9 +1,9 @@ package rds_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/rds" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/rds" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "testing" ) diff --git a/route53/route53.go b/route53/route53.go index f80b056f..6a2a424b 100644 --- a/route53/route53.go +++ b/route53/route53.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/xml" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "io" "net/http" "strconv" diff --git a/s3/export_test.go b/s3/export_test.go index a4130791..80f62558 100644 --- a/s3/export_test.go +++ b/s3/export_test.go @@ -1,7 +1,7 @@ package s3 import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) var originalStrategy = attempts diff --git a/s3/lifecycle_test.go b/s3/lifecycle_test.go index 04e143fc..e43acb8f 100644 --- a/s3/lifecycle_test.go +++ b/s3/lifecycle_test.go @@ -2,7 +2,7 @@ package s3_test import ( "encoding/xml" - "github.com/crowdmob/goamz/s3" + "github.com/AdRoll/goamz/s3" "gopkg.in/check.v1" "io/ioutil" "net/http" diff --git a/s3/multi_test.go b/s3/multi_test.go index eadfadec..875c0add 100644 --- a/s3/multi_test.go +++ b/s3/multi_test.go @@ -2,7 +2,7 @@ package s3_test import ( "encoding/xml" - "github.com/crowdmob/goamz/s3" + "github.com/AdRoll/goamz/s3" "gopkg.in/check.v1" "io" "io/ioutil" @@ -21,7 +21,7 @@ func (s *S) TestInitMulti(c *check.C) { Meta: metadata, ContentEncoding: "text/utf8", CacheControl: "no-cache", - RedirectLocation: "http://github.com/crowdmob/goamz", + RedirectLocation: "http://github.com/AdRoll/goamz", ContentMD5: "0000000000000000", } @@ -39,7 +39,7 @@ func (s *S) TestInitMulti(c *check.C) { c.Assert(req.Header["Content-Encoding"], check.DeepEquals, []string{"text/utf8"}) c.Assert(req.Header["Cache-Control"], check.DeepEquals, []string{"no-cache"}) c.Assert(req.Header["Content-Md5"], check.DeepEquals, []string{"0000000000000000"}) - c.Assert(req.Header["X-Amz-Website-Redirect-Location"], check.DeepEquals, []string{"http://github.com/crowdmob/goamz"}) + c.Assert(req.Header["X-Amz-Website-Redirect-Location"], check.DeepEquals, []string{"http://github.com/AdRoll/goamz"}) c.Assert(req.Header["X-Amz-Meta-Key1"], check.DeepEquals, []string{"value1"}) c.Assert(req.Header["X-Amz-Meta-Key2"], check.DeepEquals, []string{"value2"}) diff --git a/s3/s3.go b/s3/s3.go index aba1e254..18313c28 100644 --- a/s3/s3.go +++ b/s3/s3.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) const debug = false diff --git a/s3/s3_test.go b/s3/s3_test.go index 4f474da4..87b23ad0 100644 --- a/s3/s3_test.go +++ b/s3/s3_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/s3" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/s3" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" ) diff --git a/s3/s3i_test.go b/s3/s3i_test.go index a8979e02..e3b707b4 100644 --- a/s3/s3i_test.go +++ b/s3/s3i_test.go @@ -4,9 +4,9 @@ import ( "bytes" "crypto/md5" "fmt" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/s3" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/s3" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "io/ioutil" "net" diff --git a/s3/s3t_test.go b/s3/s3t_test.go index 17148926..29e2e753 100644 --- a/s3/s3t_test.go +++ b/s3/s3t_test.go @@ -1,9 +1,9 @@ package s3_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/s3" - "github.com/crowdmob/goamz/s3/s3test" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/s3" + "github.com/AdRoll/goamz/s3/s3test" "gopkg.in/check.v1" ) diff --git a/s3/s3test/server.go b/s3/s3test/server.go index 20d0ecc8..4dc95eae 100644 --- a/s3/s3test/server.go +++ b/s3/s3test/server.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "encoding/xml" "fmt" - "github.com/crowdmob/goamz/s3" + "github.com/AdRoll/goamz/s3" "io" "io/ioutil" "log" diff --git a/s3/sign.go b/s3/sign.go index 1c33f274..19642094 100644 --- a/s3/sign.go +++ b/s3/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha1" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "log" "sort" "strings" diff --git a/s3/sign_test.go b/s3/sign_test.go index 0e35aef6..613dc766 100644 --- a/s3/sign_test.go +++ b/s3/sign_test.go @@ -1,8 +1,8 @@ package s3_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/s3" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/s3" "gopkg.in/check.v1" ) diff --git a/sns/http_notifications_test.go b/sns/http_notifications_test.go index 3778ac36..694821a3 100644 --- a/sns/http_notifications_test.go +++ b/sns/http_notifications_test.go @@ -2,7 +2,7 @@ package sns_test import ( "encoding/json" - "github.com/crowdmob/goamz/sns" + "github.com/AdRoll/goamz/sns" "gopkg.in/check.v1" ) diff --git a/sns/sns.go b/sns/sns.go index 4f5de400..ceadb072 100644 --- a/sns/sns.go +++ b/sns/sns.go @@ -3,7 +3,7 @@ package sns import ( "encoding/xml" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "net/http" ) diff --git a/sns/sns_test.go b/sns/sns_test.go index 140ba667..ab9f3273 100644 --- a/sns/sns_test.go +++ b/sns/sns_test.go @@ -1,9 +1,9 @@ package sns_test import ( - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/sns" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/sns" + "github.com/AdRoll/goamz/testutil" "gopkg.in/check.v1" "testing" ) diff --git a/sns/structs.go b/sns/structs.go index 1dd27c4f..3efb0416 100644 --- a/sns/structs.go +++ b/sns/structs.go @@ -1,7 +1,7 @@ package sns import ( - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) type Topic struct { diff --git a/sqs/README.md b/sqs/README.md index b816fa37..c4169a8f 100644 --- a/sqs/README.md +++ b/sqs/README.md @@ -6,7 +6,7 @@ Merged from https://github.com/Mistobaan/sqs Installation ------------ - go get github.com/crowdmob/goamz/sqs + go get github.com/AdRoll/goamz/sqs Testing diff --git a/sqs/sign.go b/sqs/sign.go index 66dd895d..57c93e7d 100644 --- a/sqs/sign.go +++ b/sqs/sign.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "sort" "strings" ) diff --git a/sqs/sqs.go b/sqs/sqs.go index 16f2cda9..bc776d43 100644 --- a/sqs/sqs.go +++ b/sqs/sqs.go @@ -13,7 +13,7 @@ import ( "encoding/xml" "errors" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "io" "io/ioutil" "log" diff --git a/sqs/sqs_test.go b/sqs/sqs_test.go index f69ca7a4..bd60d87e 100644 --- a/sqs/sqs_test.go +++ b/sqs/sqs_test.go @@ -3,7 +3,7 @@ package sqs import ( "crypto/md5" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "hash" "reflect" diff --git a/sqs/suite_test.go b/sqs/suite_test.go index a98e3a0a..bdfb1045 100644 --- a/sqs/suite_test.go +++ b/sqs/suite_test.go @@ -3,7 +3,7 @@ package sqs import ( "flag" "fmt" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" "net/http" "net/url" diff --git a/sts/sts.go b/sts/sts.go index 94292172..ee57004b 100644 --- a/sts/sts.go +++ b/sts/sts.go @@ -1,7 +1,7 @@ // // sts: This package provides types and functions to interact with the AWS STS API // -// Depends on https://github.com/crowdmob/goamz +// Depends on https://github.com/AdRoll/goamz // package sts @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" ) // The STS type encapsulates operations within a specific EC2 region. diff --git a/sts/sts_test.go b/sts/sts_test.go index d9dbbb1a..63b00175 100644 --- a/sts/sts_test.go +++ b/sts/sts_test.go @@ -6,9 +6,9 @@ import ( "gopkg.in/check.v1" - "github.com/crowdmob/goamz/aws" - "github.com/crowdmob/goamz/sts" - "github.com/crowdmob/goamz/testutil" + "github.com/AdRoll/goamz/aws" + "github.com/AdRoll/goamz/sts" + "github.com/AdRoll/goamz/testutil" ) func Test(t *testing.T) { diff --git a/testutil/suite.go b/testutil/suite.go index 90cf4924..f5c54a76 100644 --- a/testutil/suite.go +++ b/testutil/suite.go @@ -2,7 +2,7 @@ package testutil import ( "flag" - "github.com/crowdmob/goamz/aws" + "github.com/AdRoll/goamz/aws" "gopkg.in/check.v1" )