From ac2a5bba3cc45d31ce826ddd6ad38710224eaaef Mon Sep 17 00:00:00 2001 From: Kotagan Date: Sat, 4 Apr 2020 18:14:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20uptate=20cast=E5=88=B0v1.3.0version=20(#?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: uptate cast到v1.3.0version * fix: go.sum --- batch_peek_message.go | 3 ++- batch_receive_message.go | 3 ++- batch_send_message.go | 3 ++- change_visibility_timeout.go | 3 ++- create_queue.go | 3 ++- create_topic.go | 3 ++- delete_message.go | 3 ++- delete_queue.go | 3 ++- delete_topic.go | 3 ++- get_queue_attribute.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- list_queue.go | 3 ++- peek_message.go | 3 ++- publish_msg.go | 3 ++- queue_meta_override.go | 3 ++- receive_message.go | 3 ++- send_message.go | 5 +++-- set_topic_attributes.go | 3 ++- topic_subscribe.go | 3 ++- topic_unsubscribe.go | 3 ++- 21 files changed, 42 insertions(+), 23 deletions(-) diff --git a/batch_peek_message.go b/batch_peek_message.go index 7c060b4..488c045 100644 --- a/batch_peek_message.go +++ b/batch_peek_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -21,7 +22,7 @@ func (c *Client) BatchPeekMessage(name string) (*BatchPeekMessageResponse, error requestLine := fmt.Sprintf(mnsBatchPeekMessage, name, "16") req := c.ca.NewRequest().Get().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/batch_receive_message.go b/batch_receive_message.go index 3187229..8dc5dcc 100644 --- a/batch_receive_message.go +++ b/batch_receive_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -36,7 +37,7 @@ func (c *Client) BatchReceiveMessage(name string, setters ...ReceiveMessageParam requestLine := fmt.Sprintf(mnsBatchReceiveMessage, name) req := c.ca.NewRequest().Get().WithPath(requestLine).WithQueryParam(&receiveMessage) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/batch_send_message.go b/batch_send_message.go index d1e3182..1070d30 100644 --- a/batch_send_message.go +++ b/batch_send_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -54,7 +55,7 @@ start: return nil, err } - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/change_visibility_timeout.go b/change_visibility_timeout.go index 180e54a..fdd9b3b 100644 --- a/change_visibility_timeout.go +++ b/change_visibility_timeout.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -30,7 +31,7 @@ func (c *Client) ChangeVisibilityTimeout( requestLine := fmt.Sprintf(mnsChangeMessageVisibility, name, receiptHandle, strconv.Itoa(visibilityTimeout)) req := c.ca.NewRequest().Put().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/create_queue.go b/create_queue.go index 0886025..9b4b268 100644 --- a/create_queue.go +++ b/create_queue.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -31,7 +32,7 @@ func (c *Client) CreateQueue(name string, setters ...QueueAttributeSetter) (stri requestLine := fmt.Sprintf(mnsCreateQueue, name) req := c.ca.NewRequest().Put().WithPath(requestLine).WithXMLBody(&attri).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return "", err } diff --git a/create_topic.go b/create_topic.go index 98e7184..f898b43 100644 --- a/create_topic.go +++ b/create_topic.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -26,7 +27,7 @@ func (c *Client) CreateTopic(name string, setters ...TopicAttributeSetter) error requestLine := fmt.Sprintf(mnsCreateTopic, name) req := c.ca.NewRequest().Put().WithPath(requestLine).WithXMLBody(&attri).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/delete_message.go b/delete_message.go index 87aa1dc..760e62c 100644 --- a/delete_message.go +++ b/delete_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -13,7 +14,7 @@ func (c *Client) DeleteMessage(name, receiptHandle string) error { requestLine := fmt.Sprintf(mnsDeleteMessage, name, receiptHandle) req := c.ca.NewRequest().Delete().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/delete_queue.go b/delete_queue.go index e874b80..8a8e493 100644 --- a/delete_queue.go +++ b/delete_queue.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -13,7 +14,7 @@ func (c *Client) DeleteQueue(name string) error { requestLine := fmt.Sprintf(mnsDeleteQueue, name) req := c.ca.NewRequest().Delete().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/delete_topic.go b/delete_topic.go index e98141f..ada8cc5 100644 --- a/delete_topic.go +++ b/delete_topic.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -13,7 +14,7 @@ func (c *Client) DeleteTopic(name string) error { requestLine := fmt.Sprintf(mnsDeleteTopic, name) req := c.ca.NewRequest().Delete().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/get_queue_attribute.go b/get_queue_attribute.go index a56ac73..abb8bfc 100644 --- a/get_queue_attribute.go +++ b/get_queue_attribute.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -31,7 +32,7 @@ func (c *Client) GetQueueAttributes(name string) (*QueueAttributeResponse, error requestLine := fmt.Sprintf(mnsGetQueueAttributes, name) req := c.ca.NewRequest().Get().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index b8ad44b..42b98d2 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/onsi/gomega v1.8.1 // indirect github.com/sirupsen/logrus v1.4.2 github.com/vmihailenco/msgpack v4.0.4+incompatible - github.com/xiaojiaoyu100/cast v1.2.9 + github.com/xiaojiaoyu100/cast v1.3.0 github.com/xiaojiaoyu100/curlew v0.2.3 golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 // indirect golang.org/x/sys v0.0.0-20191104094858-e8c54fb511f6 // indirect diff --git a/go.sum b/go.sum index 35d0ebd..9703fc3 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/xiaojiaoyu100/cast v1.2.9 h1:hL8fiPhOnDrkToiORrBMn1XZrZyyMaqB5XVfCI1lJ3g= -github.com/xiaojiaoyu100/cast v1.2.9/go.mod h1:smc6oedQStn3NkaLOySSku1MDWcZHKA+hZDijVyyNcs= +github.com/xiaojiaoyu100/cast v1.3.0 h1:XoMMGSKB/jdfQ8Y83p3rf3lQjdDV5Ai1bdXP+pXbjr0= +github.com/xiaojiaoyu100/cast v1.3.0/go.mod h1:smc6oedQStn3NkaLOySSku1MDWcZHKA+hZDijVyyNcs= github.com/xiaojiaoyu100/curlew v0.2.3 h1:i3S6MU3TEsR77vN34zDTYHuhGHXg7i/yDBXL0mkamGY= github.com/xiaojiaoyu100/curlew v0.2.3/go.mod h1:T1E4wpTXciXHO0YJPhHz8sQB/MGPLt+M7efYFKK36Hg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/list_queue.go b/list_queue.go index d6a3daf..59e17bd 100644 --- a/list_queue.go +++ b/list_queue.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "net/http" @@ -42,7 +43,7 @@ func (c *Client) ListQueue(request *ListQueueRequest) (*ListQueueResponse, error req.SetHeader(xMnxPrefix, request.Prefix) } - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/peek_message.go b/peek_message.go index cfa5e86..b25b551 100644 --- a/peek_message.go +++ b/peek_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -29,7 +30,7 @@ func (c *Client) PeekMessage(name string) (*PeekMessageResponse, error) { requestLine := fmt.Sprintf(mnsPeekMessage, name) req := c.ca.NewRequest().Get().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/publish_msg.go b/publish_msg.go index d5c94ca..d3f4382 100644 --- a/publish_msg.go +++ b/publish_msg.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -38,7 +39,7 @@ func (c *Client) PublishMessage(topic, message string, setters ...PublishMessage requestLine := fmt.Sprintf(mnsPublishMessage, topic) req := c.ca.NewRequest().Post().WithPath(requestLine).WithXMLBody(&publishMessageParam).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return "", err } diff --git a/queue_meta_override.go b/queue_meta_override.go index 9177300..f4110ba 100644 --- a/queue_meta_override.go +++ b/queue_meta_override.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -21,7 +22,7 @@ func (c *Client) QueueMetaOverride(name string, setters ...QueueAttributeSetter) requestLine := fmt.Sprintf(mnsQueueMetaOverride, name) req := c.ca.NewRequest().Put().WithPath(requestLine).WithXMLBody(&attri).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/receive_message.go b/receive_message.go index a556b17..eb4883d 100644 --- a/receive_message.go +++ b/receive_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/xml" "errors" "fmt" @@ -83,7 +84,7 @@ func (c *Client) ReceiveMessage(name string, setters ...ReceiveMessageParamSette requestLine := fmt.Sprintf(mnsReceiveMessage, name) req := c.ca.NewRequest().Get().WithPath(requestLine).WithQueryParam(&receiveMessage) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } diff --git a/send_message.go b/send_message.go index 821221d..55fd4cb 100644 --- a/send_message.go +++ b/send_message.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "encoding/base64" "encoding/json" "errors" @@ -36,7 +37,7 @@ func (c *Client) send(name string, message Message) (*SendMessageResponse, error var err error requestLine := fmt.Sprintf(mnsSendMessage, name) req := c.ca.NewRequest().Post().WithPath(requestLine).WithXMLBody(&message) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return nil, err } @@ -104,7 +105,7 @@ func (c *Client) sendMessage(name, messageBody string, setters ...MessageSetter) requestLine := fmt.Sprintf(mnsSendMessage, name) req := c.ca.NewRequest().Post().WithPath(requestLine).WithXMLBody(&attri) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if shouldRetry(err) { c.pushRetryQueue(name, attri) } diff --git a/set_topic_attributes.go b/set_topic_attributes.go index ab14d26..c41179c 100644 --- a/set_topic_attributes.go +++ b/set_topic_attributes.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -26,7 +27,7 @@ func (c *Client) SetTopicAttributes(topic string, setters ...TopicAttributeSette requestLine := fmt.Sprintf(mnsSetTopicAttributes, topic) req := c.ca.NewRequest().Put().WithPath(requestLine).WithXMLBody(&attri).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err } diff --git a/topic_subscribe.go b/topic_subscribe.go index 47eaaf3..7f54703 100644 --- a/topic_subscribe.go +++ b/topic_subscribe.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -47,7 +48,7 @@ func (c *Client) Subscribe(topic, subscription string, endpoint EndPointer, sett requestLine := fmt.Sprintf(mnsSubscribe, topic, subscription) req := c.ca.NewRequest().Put().WithPath(requestLine).WithXMLBody(&subscribeParam).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err diff --git a/topic_unsubscribe.go b/topic_unsubscribe.go index aa3d48c..08b6157 100644 --- a/topic_unsubscribe.go +++ b/topic_unsubscribe.go @@ -1,6 +1,7 @@ package alimns import ( + "context" "errors" "fmt" "net/http" @@ -21,7 +22,7 @@ func (c *Client) Unsubscribe(topic, subscription string) error { requestLine := fmt.Sprintf(mnsUnsubscribe, topic, subscription) req := c.ca.NewRequest().Delete().WithPath(requestLine).WithTimeout(apiTimeout) - resp, err := c.ca.Do(req) + resp, err := c.ca.Do(context.TODO(), req) if err != nil { return err }