Merge lp:~prudhvikrishna/goamz/sns into lp:~niemeyer/goamz/aws

[Prudhvi Surapaneni]

New SNS Related Code.

[Gustavo Niemeyer (niemeyer)]

This looks fantastic overall.

I have several points that are mainly related to conventions and idiomatic
coding for Go, but nothing really major or hard.

Please push it again and ping me once you have these ready, and let me
know if you have any questions on these.

[1]

> type Message struct {
(...)
> Message [8192]byte
(...)
> func (topic *Topic) Message(message [8192]byte, subject string) *Message {
> return &Message{topic.SNS, topic, message, subject}
> }

Both of these should use []byte rather than [8192]byte, and the field should
be named something like Payload instead of Message (Message.Message isn't
nice).

That said, why do we need the Message struct at all? It doesn't look
like it's used anywhere, so we can just drop it.

[2]

> type PublishOpt struct {
> (...)
> func (sns *SNS) Publish(options *PublishOpt) (resp *PublishResponse, err os.Error) {

This is one of the most interesting methods in the interface, and the function signature
feels a bit unfortunate to be using frequently. Let's organize it like this:

func (sns *SNS) Publish(message []byte, topic string)
func (sns *SNS) PublishSubject(message []byte, topic string, subject string)
func (sns *SNS) PublishStructure(message []byte, topic string, subject string, structure string)

The first two are actually backed by the last one.

[3]

> type Topic struct {
> *SNS
> TopicArn string
> }

s/TopicArn/ARN/

I've made the mistake of duplicating the type name in other places, but I want
to get it fixed at some point. The structure name is already Topic, so there's
no need to put Topic in the field name as well.

Also, let's please do s/Arn/ARN/ in the rest of the code in the Go side. This
is an acronym, so should be capitalized (like SNS itself).

[4]

> type Subscription struct {
> Endpoint string
> Owner string
> Protocol string
> SubscriptionArn string
> TopicArn string
> }

Similarly, s/SubscriptionArn/ARN/, and s/TopicArn/TopicARN/.

[5]

> type AttributeEntry struct {
> Key, Value string
> }
>
> type GetTopicAttributesResponse struct {
> Attributes []AttributeEntry `xml:"GetTopicAttributesResult>Attributes>entry"`
> ResponseMetadata
> }

Let's please try to avoid such long names:

s/Attributes/Attrs/
s/Response/Resp/

across the whole code, besides the necessary strings to make
Amazon happy, and ResponseMetadata which feels like a convenient
way to parse that recurring blob of data.

[6]

> type GetTopicAttributesResponse struct {
> Attributes []AttributeEntry `xml:"GetTopicAttributesResult>Attributes>entry"`

Then, the Attrs field in that type is actually a map, and users will be
much happier to handle it as such in the Go side. Define an internal struct
so that you can parse the XML out, and then internally translate it into
the following:

type GetTopicAttrsResp struct {
    Attrs map[string]string
    ResponseMetadata
}

[7]

> type SetTopicAttributesResponse struct {
> ResponseMetadata
> }
>
> type DeleteTopicResponse struct {
> ResponseMetadata
> }
> type RemovePermissionResponse struct {
> ResponseMetadata
> }
(...)

There are ...

review: Needs Fixing

Unmerged revisions

24. By Prudhvi Surapaneni on 2011-09-21

Refactor to be consistent

23. By Prudhvi Surapaneni on 2011-09-21

Add Comments

22. By Prudhvi Surapaneni on 2011-09-21

Add Functionality for ListSubscriptionsByTopic

21. By Prudhvi Surapaneni on 2011-09-21

Add functionality for RemovePermission

20. By Prudhvi Surapaneni on 2011-09-21

Add functionality for AddPermission

19. By Prudhvi Surapaneni on 2011-09-21

Add functionality for ConfirmSubscription

18. By Prudhvi Surapaneni on 2011-09-21

Add functionality for Unsubscribe

17. By Prudhvi Surapaneni on 2011-09-21

gofmt changes

16. By Prudhvi Surapaneni on 2011-09-21

Add functionality for Subscribe

15. By Prudhvi Surapaneni on 2011-09-21

Add functionality for SetTopicAttributes

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2011-09-21 19:16:26 +0000
@@ -0,0 +1,21 @@
+include $(GOROOT)/src/Make.inc
+
+TARG=launchpad.net/goamz/sns
+
+GOFILES=\
+		sns.go\
+		sign.go\
+
+include $(GOROOT)/src/Make.pkg
+
+GOFMT=gofmt
+BADFMT=$(shell $(GOFMT) -l $(GOFILES) 2> /dev/null)
+
+gofmt: $(BADFMT)
+	@for F in $(BADFMT); do $(GOFMT) -w $$F && echo $$F; done
+
+ifneq ($(BADFMT),)
+ifneq ($(MAKECMDGOALS), gofmt)
+#$(warning WARNING: make gofmt: $(BADFMT))
+endif
+endif

=== renamed file 'Makefile' => 'Makefile.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2011-09-21 19:16:26 +0000
@@ -0,0 +1,1 @@
+Amazon Simple Notification Service API for Golang.

=== added file 'responses_test.go'
--- responses_test.go	1970-01-01 00:00:00 +0000
+++ responses_test.go	2011-09-21 19:16:26 +0000
@@ -0,0 +1,164 @@
+package sns_test
+
+var TestListTopicsXmlOK = `
+<?xml version="1.0"?>
+<ListTopicsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ListTopicsResult>
+    <Topics>
+      <member>
+        <TopicArn>arn:aws:sns:us-west-1:331995417492:Transcoding</TopicArn>
+      </member>
+    </Topics>
+  </ListTopicsResult>
+  <ResponseMetadata>
+    <RequestId>bd10b26c-e30e-11e0-ba29-93c3aca2f103</RequestId>
+  </ResponseMetadata>
+</ListTopicsResponse>
+`
+
+var TestCreateTopicXmlOK = `
+<?xml version="1.0"?>
+<CreateTopicResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <CreateTopicResult>
+    <TopicArn>arn:aws:sns:us-east-1:123456789012:My-Topic</TopicArn>
+  </CreateTopicResult>
+  <ResponseMetadata>
+    <RequestId>a8dec8b3-33a4-11df-8963-01868b7c937a</RequestId>
+  </ResponseMetadata>
+</CreateTopicResponse>
+`
+
+var TestDeleteTopicXmlOK = `
+<DeleteTopicResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ResponseMetadata>
+    <RequestId>f3aa9ac9-3c3d-11df-8235-9dab105e9c32</RequestId>
+  </ResponseMetadata>
+</DeleteTopicResponse>
+`
+
+var TestListSubscriptionsXmlOK = `
+<ListSubscriptionsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ListSubscriptionsResult>
+    <Subscriptions>
+      <member>
+        <TopicArn>arn:aws:sns:us-east-1:698519295917:My-Topic</TopicArn>
+        <Protocol>email</Protocol>
+        <SubscriptionArn>arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca</SubscriptionArn>
+        <Owner>123456789012</Owner>
+        <Endpoint>[e-mail]</Endpoint>
+      </member>
+    </Subscriptions>
+  </ListSubscriptionsResult>
+  <ResponseMetadata>
+    <RequestId>384ac68d-3775-11df-8963-01868b7c937a</RequestId>
+  </ResponseMetadata>
+</ListSubscriptionsResponse>
+`
+
+var TestGetTopicAttributesXmlOK = `
+<GetTopicAttributesResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <GetTopicAttributesResult>
+     <Attributes>
+       <entry>
+         <key>Owner</key>
+         <value>123456789012</value>
+       </entry>
+       <entry>
+         <key>Policy</key>
+         <value>{"Version":"2008-10-17","Id":"us-east-1/698519295917/test__default_policy_ID","Statement" : [{"Effect":"Allow","Sid":"us-east-1/698519295917/test__default_statement_ID","Principal" : {"AWS": "*"},"Action":["SNS:GetTopicAttributes","SNS:SetTopicAttributes","SNS:AddPermission","SNS:RemovePermission","SNS:DeleteTopic","SNS:Subscribe","SNS:ListSubscriptionsByTopic","SNS:Publish","SNS:Receive"],"Resource":"arn:aws:sns:us-east-1:698519295917:test","Condition" : {"StringLike" : {"AWS:SourceArn": "arn:aws:*:*:698519295917:*"}}}]}</value>
+       </entry>
+       <entry>
+         <key>TopicArn</key>
+         <value>arn:aws:sns:us-east-1:123456789012:My-Topic</value>
+       </entry>
+     </Attributes>
+  </GetTopicAttributesResult>
+  <ResponseMetadata>
+    <RequestId>057f074c-33a7-11df-9540-99d0768312d3</RequestId>
+  </ResponseMetadata>
+</GetTopicAttributesResponse>
+`
+
+var TestPublishXmlOK = `
+<PublishResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <PublishResult>
+    <MessageId>94f20ce6-13c5-43a0-9a9e-ca52d816e90b</MessageId>
+  </PublishResult>
+  <ResponseMetadata>
+    <RequestId>f187a3c1-376f-11df-8963-01868b7c937a</RequestId>
+  </ResponseMetadata>
+</PublishResponse>
+`
+
+var TestSetTopicAttributesXmlOK = `
+<SetTopicAttributesResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ResponseMetadata>
+    <RequestId>a8763b99-33a7-11df-a9b7-05d48da6f042</RequestId>
+  </ResponseMetadata>
+</SetTopicAttributesResponse>
+`
+
+var TestSubscribeXmlOK = `
+<SubscribeResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <SubscribeResult>
+    <SubscriptionArn>pending confirmation</SubscriptionArn>
+  </SubscribeResult>
+  <ResponseMetadata>
+    <RequestId>a169c740-3766-11df-8963-01868b7c937a</RequestId>
+  </ResponseMetadata>
+</SubscribeResponse>
+`
+
+var TestUnsubscribeXmlOK = `
+<UnsubscribeResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ResponseMetadata>
+    <RequestId>18e0ac39-3776-11df-84c0-b93cc1666b84</RequestId>
+  </ResponseMetadata>
+</UnsubscribeResponse>
+`
+
+var TestConfirmSubscriptionXmlOK = `
+<ConfirmSubscriptionResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ConfirmSubscriptionResult>
+    <SubscriptionArn>arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca</SubscriptionArn>
+  </ConfirmSubscriptionResult>
+  <ResponseMetadata>
+    <RequestId>7a50221f-3774-11df-a9b7-05d48da6f042</RequestId>
+  </ResponseMetadata>
+</ConfirmSubscriptionResponse>
+`
+
+var TestAddPermissionXmlOK = `
+<AddPermissionResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ResponseMetadata>
+    <RequestId>6a213e4e-33a8-11df-9540-99d0768312d3</RequestId>
+  </ResponseMetadata>
+</AddPermissionResponse>
+`
+
+var TestRemovePermissionXmlOK = `
+<RemovePermissionResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ResponseMetadata>
+    <RequestId>d170b150-33a8-11df-995a-2d6fbe836cc1</RequestId>
+  </ResponseMetadata>
+</RemovePermissionResponse>
+`
+
+var TestListSubscriptionsByTopicXmlOK = `
+<ListSubscriptionsByTopicResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+  <ListSubscriptionsByTopicResult>
+    <Subscriptions>
+      <member>
+        <TopicArn>arn:aws:sns:us-east-1:123456789012:My-Topic</TopicArn>
+        <Protocol>email</Protocol>
+        <SubscriptionArn>arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca</SubscriptionArn>
+        <Owner>123456789012</Owner>
+        <Endpoint>[e-mail]</Endpoint>
+      </member>
+    </Subscriptions>
+  </ListSubscriptionsByTopicResult>
+  <ResponseMetadata>
+    <RequestId>b9275252-3774-11df-9540-99d0768312d3</RequestId>
+  </ResponseMetadata>
+</ListSubscriptionsByTopicResponse>
+`

=== added file 'sign.go'
--- sign.go	1970-01-01 00:00:00 +0000
+++ sign.go	2011-09-21 19:16:26 +0000
@@ -0,0 +1,64 @@
+package sns
+
+import (
+	"crypto/hmac"
+	"encoding/base64"
+	"launchpad.net/goamz/aws"
+	"sort"
+	"strings"
+)
+
+var b64 = base64.StdEncoding
+/*
+func sign(auth aws.Auth, method, path string, params url.Values, headers http.Header) {
+    var host string
+    for k, v := range headers {
+        k = strings.ToLower(k)
+        switch k {
+        case "host":
+            host = v[0]
+        }
+    }
+
+    params["AWSAccessKeyId"] = []string{auth.AccessKey}
+    params["SignatureVersion"] = []string{"2"}
+    params["SignatureMethod"] = []string{"HmacSHA256"}
+
+    var sarry []string
+    for k, v := range params {
+        sarry = append(sarry, aws.Encode(k) + "=" + aws.Encode(v[0]))
+    }
+
+    sort.StringSlice(sarry).Sort()
+    joined := strings.Join(sarry, "&")
+
+    payload := strings.Join([]string{method, host, "/", joined}, "\n")
+    hash := hmac.NewSHA256([]byte(auth.SecretKey))
+    hash.Write([]byte(payload))
+    signature := make([]byte, b64.EncodedLen(hash.Size()))
+    b64.Encode(signature, hash.Sum())
+
+    params["Signature"] = []string{"AWS " + string(signature)}
+    println("Payload:", payload)
+    println("Signature:", strings.Join(params["Signature"], "|"))
+}*/
+
+func sign(auth aws.Auth, method, path string, params map[string]string, host string) {
+	params["AWSAccessKeyId"] = auth.AccessKey
+	params["SignatureVersion"] = "2"
+	params["SignatureMethod"] = "HmacSHA256"
+
+	var sarray []string
+	for k, v := range params {
+		sarray = append(sarray, aws.Encode(k)+"="+aws.Encode(v))
+	}
+	sort.StringSlice(sarray).Sort()
+	joined := strings.Join(sarray, "&")
+	payload := method + "\n" + host + "\n" + path + "\n" + joined
+	hash := hmac.NewSHA256([]byte(auth.SecretKey))
+	hash.Write([]byte(payload))
+	signature := make([]byte, b64.EncodedLen(hash.Size()))
+	b64.Encode(signature, hash.Sum())
+
+	params["Signature"] = string(signature)
+}

=== added file 'sns.go'
--- sns.go	1970-01-01 00:00:00 +0000
+++ sns.go	2011-09-21 19:16:26 +0000
@@ -0,0 +1,428 @@
+//
+// goamz - Go packages to interact with the Amazon Web Services.
+//
+//   https://wiki.ubuntu.com/goamz
+//
+// Copyright (c) 2011 Memeo Inc.
+//
+// Written by Prudhvi Krishna Surapaneni <[e-mail]>
+//
+package sns
+
+import (
+	"launchpad.net/goamz/aws"
+	"os"
+	"http"
+	"time"
+	"url"
+	"xml"
+	"strconv"
+)
+
+// The SNS type encapsulates operation with an SNS region.
+type SNS struct {
+	aws.Auth
+	aws.Region
+	private byte // Reserve the right of using private data.
+}
+
+type Topic struct {
+	*SNS
+	TopicArn string
+}
+
+func New(auth aws.Auth, region aws.Region) *SNS {
+	return &SNS{auth, region, 0}
+}
+
+type Message struct {
+	*SNS
+	*Topic
+	Message [8192]byte
+	Subject string
+}
+
+type Subscription struct {
+	Endpoint        string
+	Owner           string
+	Protocol        string
+	SubscriptionArn string
+	TopicArn        string
+}
+
+func (topic *Topic) Message(message [8192]byte, subject string) *Message {
+	return &Message{topic.SNS, topic, message, subject}
+}
+
+type ResponseMetadata struct {
+	RequestId string
+	BoxUsage  float64
+}
+
+type ListTopicsResponse struct {
+	Topics    []Topic `xml:"ListTopicsResult>Topics>member"`
+	NextToken string
+	ResponseMetadata
+}
+
+type CreateTopicResponse struct {
+	Topic Topic `xml:"CreateTopicResult>"`
+	ResponseMetadata
+}
+
+type DeleteTopicResponse struct {
+	ResponseMetadata
+}
+
+type ListSubscriptionsResponse struct {
+	Subscriptions []Subscription `xml:"ListSubscriptionsResult>Subscriptions>member"`
+	NextToken     string
+	ResponseMetadata
+}
+
+type AttributeEntry struct {
+	Key, Value string
+}
+
+type GetTopicAttributesResponse struct {
+	Attributes []AttributeEntry `xml:"GetTopicAttributesResult>Attributes>entry"`
+	ResponseMetadata
+}
+
+func makeParams(action string) map[string]string {
+	params := make(map[string]string)
+	params["Action"] = action
+	return params
+}
+
+// ListTopics
+//
+// See http://goo.gl/lfrMK for more details.
+func (sns *SNS) ListTopics(NextToken *string) (resp *ListTopicsResponse, err os.Error) {
+	resp = &ListTopicsResponse{}
+	params := makeParams("ListTopics")
+	if NextToken != nil {
+		params["NextToken"] = *NextToken
+	}
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+// CreateTopic
+//
+// See http://goo.gl/m9aAt for more details.
+func (sns *SNS) CreateTopic(Name string) (resp *CreateTopicResponse, err os.Error) {
+	resp = &CreateTopicResponse{}
+	params := makeParams("CreateTopic")
+	params["Name"] = Name
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+// DeleteTopic
+//
+// See http://goo.gl/OXNcY for more details.
+func (sns *SNS) DeleteTopic(topic Topic) (resp *DeleteTopicResponse, err os.Error) {
+	resp = &DeleteTopicResponse{}
+	params := makeParams("DeleteTopic")
+	params["TopicArn"] = topic.TopicArn
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+// Delete
+//
+// Helper function for deleting a topic
+func (topic *Topic) Delete() (resp *DeleteTopicResponse, err os.Error) {
+	return topic.SNS.DeleteTopic(*topic)
+}
+
+// ListSubscriptions
+//
+// See http://goo.gl/k3aGn for more details.
+func (sns *SNS) ListSubscriptions(NextToken *string) (resp *ListSubscriptionsResponse, err os.Error) {
+	resp = &ListSubscriptionsResponse{}
+	params := makeParams("ListSubscriptions")
+	if NextToken != nil {
+		params["NextToken"] = *NextToken
+	}
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+// GetTopicAttributes
+//
+// See http://goo.gl/WXRoX for more details.
+func (sns *SNS) GetTopicAttributes(TopicArn string) (resp *GetTopicAttributesResponse, err os.Error) {
+	resp = &GetTopicAttributesResponse{}
+	params := makeParams("GetTopicAttributes")
+	params["TopicArn"] = TopicArn
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type PublishOpt struct {
+	Message          string
+	MessageStructure string
+	Subject          string
+	TopicArn         string
+}
+
+type PublishResponse struct {
+	MessageId string `xml:"PublishResult>MessageId"`
+	ResponseMetadata
+}
+
+// Publish
+//
+// See http://goo.gl/AY2D8 for more details.
+func (sns *SNS) Publish(options *PublishOpt) (resp *PublishResponse, err os.Error) {
+	resp = &PublishResponse{}
+	params := makeParams("Publish")
+
+	if options.Subject != "" {
+		params["Subject"] = options.Subject
+	}
+
+	if options.MessageStructure != "" {
+		params["MessageStructure"] = options.MessageStructure
+	}
+
+	if options.Message != "" {
+		params["Message"] = options.Message
+	}
+
+	if options.TopicArn != "" {
+		params["TopicArn"] = options.TopicArn
+	}
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type SetTopicAttributesResponse struct {
+	ResponseMetadata
+}
+
+// SetTopicAttributes
+//
+// See http://goo.gl/oVYW7 for more details.
+func (sns *SNS) SetTopicAttributes(AttributeName, AttributeValue, TopicArn string) (resp *SetTopicAttributesResponse, err os.Error) {
+	resp = &SetTopicAttributesResponse{}
+	params := makeParams("SetTopicAttributes")
+
+	if AttributeName == "" || TopicArn == "" {
+		return nil, os.NewError("Invalid Attribute Name or TopicArn")
+	}
+
+	params["AttributeName"] = AttributeName
+	params["AttributeValue"] = AttributeValue
+	params["TopicArn"] = TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type SubscribeResponse struct {
+	SubscriptionArn string `xml:"SubscribeResult>SubscriptionArn"`
+	ResponseMetadata
+}
+
+// Subscribe
+//
+// See http://goo.gl/c3iGS for more details.
+func (sns *SNS) Subscribe(Endpoint, Protocol, TopicArn string) (resp *SubscribeResponse, err os.Error) {
+	resp = &SubscribeResponse{}
+	params := makeParams("Subscribe")
+
+	params["Endpoint"] = Endpoint
+	params["Protocol"] = Protocol
+	params["TopicArn"] = TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type UnsubscribeResponse struct {
+	ResponseMetadata
+}
+
+// Unsubscribe
+//
+// See http://goo.gl/4l5Ge for more details.
+func (sns *SNS) Unsubscribe(SubscriptionArn string) (resp *UnsubscribeResponse, err os.Error) {
+	resp = &UnsubscribeResponse{}
+	params := makeParams("Unsubscribe")
+
+	params["SubscriptionArn"] = SubscriptionArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type ConfirmSubscriptionResponse struct {
+	SubscriptionArn string `xml:"ConfirmSubscriptionResult>SubscriptionArn"`
+	ResponseMetadata
+}
+
+type ConfirmSubscriptionOpt struct {
+	AuthenticateOnUnsubscribe string
+	Token                     string
+	TopicArn                  string
+}
+
+// ConfirmSubscription
+//
+// See http://goo.gl/3hXzH for more details.
+func (sns *SNS) ConfirmSubscription(options *ConfirmSubscriptionOpt) (resp *ConfirmSubscriptionResponse, err os.Error) {
+	resp = &ConfirmSubscriptionResponse{}
+	params := makeParams("ConfirmSubscription")
+
+	if options.AuthenticateOnUnsubscribe != "" {
+		params["AuthenticateOnUnsubscribe"] = options.AuthenticateOnUnsubscribe
+	}
+
+	params["Token"] = options.Token
+	params["TopicArn"] = options.TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type Permission struct {
+	ActionName string
+	AccountId  string
+}
+
+type AddPermissionResponse struct {
+	ResponseMetadata
+}
+
+// AddPermission
+//
+// See http://goo.gl/mbY4a for more details.
+func (sns *SNS) AddPermission(permissions []Permission, Label, TopicArn string) (resp *AddPermissionResponse, err os.Error) {
+	resp = &AddPermissionResponse{}
+	params := makeParams("AddPermission")
+
+	for i, p := range permissions {
+		params["AWSAccountId.member."+strconv.Itoa(i+1)] = p.AccountId
+		params["ActionName.member."+strconv.Itoa(i+1)] = p.ActionName
+	}
+
+	params["Label"] = Label
+	params["TopicArn"] = TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type RemovePermissionResponse struct {
+	ResponseMetadata
+}
+
+// RemovePermission
+//
+// See http://goo.gl/wGl5j for more details.
+func (sns *SNS) RemovePermission(Label, TopicArn string) (resp *RemovePermissionResponse, err os.Error) {
+	resp = &RemovePermissionResponse{}
+	params := makeParams("RemovePermission")
+
+	params["Label"] = Label
+	params["TopicArn"] = TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type ListSubscriptionByTopicResponse struct {
+	Subscriptions []Subscription `xml:"ListSubscriptionsByTopicResult>Subscriptions>member"`
+	ResponseMetadata
+}
+
+type ListSubscriptionByTopicOpt struct {
+	NextToken string
+	TopicArn  string
+}
+
+// ListSubscriptionByTopic
+//
+// See http://goo.gl/LaVcC for more details.
+func (sns *SNS) ListSubscriptionByTopic(options *ListSubscriptionByTopicOpt) (resp *ListSubscriptionByTopicResponse, err os.Error) {
+	resp = &ListSubscriptionByTopicResponse{}
+	params := makeParams("ListSbubscriptionByTopic")
+
+	if options.NextToken != "" {
+		params["NextToken"] = options.NextToken
+	}
+
+	params["TopicArn"] = options.TopicArn
+
+	err = sns.query(nil, nil, params, resp)
+	return
+}
+
+type Error struct {
+	StatusCode int
+	Code       string
+	Message    string
+	RequestId  string
+}
+
+func (err *Error) String() string {
+	return err.Message
+}
+
+type xmlErrors struct {
+	RequestId string
+	Errors    []Error `xml:"Errors>Error"`
+}
+
+func (sns *SNS) query(topic *Topic, message *Message, params map[string]string, resp interface{}) os.Error {
+	params["Timestamp"] = time.UTC().Format(time.RFC3339)
+	url_, err := url.Parse(sns.Region.SNSEndpoint)
+	if err != nil {
+		return err
+	}
+
+	sign(sns.Auth, "GET", "/", params, url_.Host)
+	url_.RawQuery = multimap(params).Encode()
+	r, err := http.Get(url_.String())
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+
+	//dump, _ := http.DumpResponse(r, true)
+	//println("DUMP:\n", string(dump))
+	//return nil
+
+	if r.StatusCode != 200 {
+		return buildError(r)
+	}
+	err = xml.Unmarshal(r.Body, resp)
+	return err
+}
+
+func buildError(r *http.Response) os.Error {
+	errors := xmlErrors{}
+	xml.Unmarshal(r.Body, &errors)
+	var err Error
+	if len(errors.Errors) > 0 {
+		err = errors.Errors[0]
+	}
+	err.RequestId = errors.RequestId
+	err.StatusCode = r.StatusCode
+	if err.Message == "" {
+		err.Message = r.Status
+	}
+	return &err
+}
+
+func multimap(p map[string]string) url.Values {
+	q := make(url.Values, len(p))
+	for k, v := range p {
+		q[k] = []string{v}
+	}
+	return q
+}

=== added file 'sns_test.go'
--- sns_test.go	1970-01-01 00:00:00 +0000
+++ sns_test.go	2011-09-21 19:16:26 +0000
@@ -0,0 +1,230 @@
+package sns_test
+
+import (
+        "launchpad.net/gocheck"
+        "launchpad.net/goamz/aws"
+        "launchpad.net/goamz/sns"
+)
+
+var _ = gocheck.Suite(&S{})
+
+type S struct {
+    HTTPSuite
+    sns *sns.SNS
+}
+
+func (s *S) SetUpSuite(c *gocheck.C) {
+    s.HTTPSuite.SetUpSuite(c)
+    auth := aws.Auth{"abc", "123"}
+    s.sns = sns.New(auth, aws.Region{SNSEndpoint: testServer.URL})
+}
+
+func (s *S) TestListTopicsOK(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestListTopicsXmlOK)
+
+    resp, err := s.sns.ListTopics(nil)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "bd10b26c-e30e-11e0-ba29-93c3aca2f103")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestCreateTopic(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestCreateTopicXmlOK)
+
+    resp, err := s.sns.CreateTopic("My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.Topic.TopicArn, gocheck.Equals, "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "a8dec8b3-33a4-11df-8963-01868b7c937a")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestDeleteTopic(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestDeleteTopicXmlOK)
+
+    t := sns.Topic{nil, "arn:aws:sns:us-east-1:123456789012:My-Topic"}
+    resp, err := s.sns.DeleteTopic(t)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "f3aa9ac9-3c3d-11df-8235-9dab105e9c32")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestListSubscriptions(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestListSubscriptionsXmlOK)
+
+    resp, err := s.sns.ListSubscriptions(nil)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(len(resp.Subscriptions), gocheck.Not(gocheck.Equals), 0)
+    c.Assert(resp.Subscriptions[0].Protocol, gocheck.Equals, "email")
+    c.Assert(resp.Subscriptions[0].Endpoint, gocheck.Equals, "[e-mail]")
+    c.Assert(resp.Subscriptions[0].SubscriptionArn, gocheck.Equals, "arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca")
+    c.Assert(resp.Subscriptions[0].TopicArn, gocheck.Equals, "arn:aws:sns:us-east-1:698519295917:My-Topic")
+    c.Assert(resp.Subscriptions[0].Owner, gocheck.Equals, "123456789012")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestGetTopicAttributes(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestGetTopicAttributesXmlOK)
+
+    resp, err := s.sns.GetTopicAttributes("arn:aws:sns:us-east-1:123456789012:My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(len(resp.Attributes), gocheck.Not(gocheck.Equals), 0)
+    c.Assert(resp.Attributes[0].Key, gocheck.Equals, "Owner")
+    c.Assert(resp.Attributes[0].Value, gocheck.Equals, "123456789012")
+    c.Assert(resp.Attributes[1].Key, gocheck.Equals, "Policy")
+    c.Assert(resp.Attributes[1].Value, gocheck.Equals, `{"Version":"2008-10-17","Id":"us-east-1/698519295917/test__default_policy_ID","Statement" : [{"Effect":"Allow","Sid":"us-east-1/698519295917/test__default_statement_ID","Principal" : {"AWS": "*"},"Action":["SNS:GetTopicAttributes","SNS:SetTopicAttributes","SNS:AddPermission","SNS:RemovePermission","SNS:DeleteTopic","SNS:Subscribe","SNS:ListSubscriptionsByTopic","SNS:Publish","SNS:Receive"],"Resource":"arn:aws:sns:us-east-1:698519295917:test","Condition" : {"StringLike" : {"AWS:SourceArn": "arn:aws:*:*:698519295917:*"}}}]}`)
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "057f074c-33a7-11df-9540-99d0768312d3")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestPublish(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestPublishXmlOK)
+
+    pubOpt := &sns.PublishOpt{"foobar","","subject","arn:aws:sns:us-east-1:123456789012:My-Topic"}
+    resp, err := s.sns.Publish(pubOpt)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.MessageId, gocheck.Equals, "94f20ce6-13c5-43a0-9a9e-ca52d816e90b")
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "f187a3c1-376f-11df-8963-01868b7c937a")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestSetTopicAttributes(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestSetTopicAttributesXmlOK)
+
+    resp, err := s.sns.SetTopicAttributes("DisplayName", "MyTopicName", "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "a8763b99-33a7-11df-a9b7-05d48da6f042")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestSubscribe(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestSubscribeXmlOK)
+
+    resp, err := s.sns.Subscribe("[e-mail]", "email", "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.SubscriptionArn, gocheck.Equals, "pending confirmation")
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "a169c740-3766-11df-8963-01868b7c937a")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestUnsubscribe(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestUnsubscribeXmlOK)
+
+    resp, err := s.sns.Unsubscribe("arn:aws:sns:us-east-1:123456789012:My-Topic:a169c740-3766-11df-8963-01868b7c937a")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "18e0ac39-3776-11df-84c0-b93cc1666b84")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestConfirmSubscription(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestConfirmSubscriptionXmlOK)
+
+    opt := &sns.ConfirmSubscriptionOpt{"", "51b2ff3edb475b7d91550e0ab6edf0c1de2a34e6ebaf6", "arn:aws:sns:us-east-1:123456789012:My-Topic"}
+    resp, err := s.sns.ConfirmSubscription(opt)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.SubscriptionArn, gocheck.Equals, "arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca")
+    c.Assert(resp.ResponseMetadata.RequestId, gocheck.Equals, "7a50221f-3774-11df-a9b7-05d48da6f042")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestAddPermission(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestAddPermissionXmlOK)
+    perm := make([]sns.Permission,2)
+    perm[0].ActionName = "Publish"
+    perm[1].ActionName = "GetTopicAttributes"
+    perm[0].AccountId = "987654321000"
+    perm[1].AccountId = "876543210000"
+
+    resp, err := s.sns.AddPermission(perm, "NewPermission", "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.RequestId, gocheck.Equals, "6a213e4e-33a8-11df-9540-99d0768312d3")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestRemovePermission(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestRemovePermissionXmlOK)
+
+    resp, err := s.sns.RemovePermission("NewPermission", "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(resp.RequestId, gocheck.Equals, "d170b150-33a8-11df-995a-2d6fbe836cc1")
+    c.Assert(err, gocheck.IsNil)
+}
+
+func (s *S) TestListSubscriptionByTopic(c *gocheck.C) {
+    testServer.PrepareResponse(200, nil, TestListSubscriptionsByTopicXmlOK)
+
+    opt := &sns.ListSubscriptionByTopicOpt{"", "arn:aws:sns:us-east-1:123456789012:My-Topic"}
+    resp, err := s.sns.ListSubscriptionByTopic(opt)
+    req := testServer.WaitRequest()
+
+    c.Assert(req.Method, gocheck.Equals, "GET")
+    c.Assert(req.URL.Path, gocheck.Equals, "/")
+    c.Assert(req.Header["Date"], gocheck.Not(gocheck.Equals), "")
+
+    c.Assert(len(resp.Subscriptions), gocheck.Not(gocheck.Equals), 0)
+    c.Assert(resp.Subscriptions[0].TopicArn, gocheck.Equals, "arn:aws:sns:us-east-1:123456789012:My-Topic")
+    c.Assert(resp.Subscriptions[0].SubscriptionArn, gocheck.Equals, "arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6-0fd4-4079-afb4-ce8c8260f0ca")
+    c.Assert(resp.Subscriptions[0].Owner, gocheck.Equals, "123456789012")
+    c.Assert(resp.Subscriptions[0].Endpoint, gocheck.Equals, "[e-mail]")
+    c.Assert(resp.Subscriptions[0].Protocol, gocheck.Equals, "email")
+    c.Assert(err, gocheck.IsNil)
+}

=== added file 'suite_test.go'
--- suite_test.go	1970-01-01 00:00:00 +0000
+++ suite_test.go	2011-09-21 19:16:26 +0000
@@ -0,0 +1,139 @@
+package sns_test
+
+import (
+	"flag"
+	"fmt"
+	. "launchpad.net/gocheck"
+	"http"
+	"launchpad.net/goamz/aws"
+	"os"
+	"testing"
+	"time"
+	"url"
+)
+
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
+var integration = flag.Bool("i", false, "Enable integration tests")
+
+type SuiteI struct {
+	auth aws.Auth
+}
+
+func (s *SuiteI) SetUpSuite(c *C) {
+	if !*integration {
+		c.Skip("Integration tests not enabled (-i flag)")
+	}
+	auth, err := aws.EnvAuth()
+	if err != nil {
+		c.Fatal(err.String())
+	}
+	s.auth = auth
+}
+
+type HTTPSuite struct{}
+
+var testServer = NewTestHTTPServer("http://localhost:4444", 5e9)
+
+func (s *HTTPSuite) SetUpSuite(c *C) {
+	testServer.Start()
+}
+
+func (s *HTTPSuite) TearDownTest(c *C) {
+	testServer.FlushRequests()
+}
+
+type TestHTTPServer struct {
+	URL      string
+	Timeout  int64
+	started  bool
+	request  chan *http.Request
+	response chan *testResponse
+	pending  chan bool
+}
+
+type testResponse struct {
+	Status  int
+	Headers map[string]string
+	Body    string
+}
+
+func NewTestHTTPServer(url string, timeout int64) *TestHTTPServer {
+	return &TestHTTPServer{URL: url, Timeout: timeout}
+}
+
+func (s *TestHTTPServer) Start() {
+	if s.started {
+		return
+	}
+	s.started = true
+
+	s.request = make(chan *http.Request, 64)
+	s.response = make(chan *testResponse, 64)
+	s.pending = make(chan bool, 64)
+
+	url, _ := url.Parse(s.URL)
+	go http.ListenAndServe(url.Host, s)
+
+	s.PrepareResponse(202, nil, "Nothing.")
+	for {
+		// Wait for it to be up.
+		resp, err := http.Get(s.URL)
+		if err == nil && resp.StatusCode == 202 {
+			break
+		}
+		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
+		time.Sleep(1e8)
+	}
+	fmt.Fprintf(os.Stderr, "done\n\n")
+	s.WaitRequest() // Consume dummy request.
+}
+
+// FlushRequests discards requests which were not yet consumed by WaitRequest.
+func (s *TestHTTPServer) FlushRequests() {
+	for {
+		select {
+		case <-s.request:
+		default:
+			return
+		}
+	}
+}
+
+func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	s.request <- req
+	var resp *testResponse
+	select {
+	case resp = <-s.response:
+	case <-time.After(s.Timeout):
+		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
+		resp = &testResponse{500, nil, ""}
+	}
+	if resp.Headers != nil {
+		h := w.Header()
+		for k, v := range resp.Headers {
+			h.Set(k, v)
+		}
+	}
+	if resp.Status != 0 {
+		w.WriteHeader(resp.Status)
+	}
+	w.Write([]byte(resp.Body))
+}
+
+func (s *TestHTTPServer) WaitRequest() *http.Request {
+	select {
+	case req := <-s.request:
+		req.ParseForm()
+		return req
+	case <-time.After(s.Timeout):
+		panic("Timeout waiting for goamz request")
+	}
+	panic("unreached")
+}
+
+func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
+	s.response <- &testResponse{status, headers, body}
+}

=== renamed file 'suite_test.go' => 'suite_test.go.moved'