fixed nil check

Author: Dai.Otsuka

app/models/sns.go

@@ -217,6 +217,10 @@ func (r *PublishRequest) SetAttributesFromForm(values url.Values) {
 		stringValue := values.Get(fmt.Sprintf("MessageAttributes.entry.%d.Value.StringValue", i))
 		binaryValue := values.Get(fmt.Sprintf("MessageAttributes.entry.%d.Value.BinaryValue", i))
 
+		if r.MessageAttributes == nil {
+			r.MessageAttributes = make(map[string]MessageAttributeValue)
+		}
+
 		r.MessageAttributes[name] = MessageAttributeValue{
 			DataType:    dataType,
 			StringValue: stringValue,

smoke_tests/sns_publish_test.go

@@ -2,6 +2,7 @@ package smoke_tests
 
 import (
 	"context"
+	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -11,13 +12,16 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 
 	"github.com/Admiral-Piett/goaws/app/conf"
+	af "github.com/Admiral-Piett/goaws/app/fixtures"
 	"github.com/Admiral-Piett/goaws/app/test"
 
 	"github.com/gavv/httpexpect/v2"
 
 	"github.com/Admiral-Piett/goaws/app"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/sns"
+	"github.com/aws/aws-sdk-go-v2/service/sns/types"
+	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -52,6 +56,74 @@ func Test_Publish_sqs_json_raw(t *testing.T) {
 	assert.Equal(t, message, string(messages[0].MessageBody))
 }
 
+func Test_Publish_Sqs_With_Message_Attributes(t *testing.T) {
+	server := generateServer()
+	defer func() {
+		server.Close()
+		test.ResetResources()
+	}()
+
+	sdkConfig, _ := config.LoadDefaultConfig(context.TODO())
+	sdkConfig.BaseEndpoint = aws.String(server.URL)
+	sqsClient := sqs.NewFromConfig(sdkConfig)
+	snsClient := sns.NewFromConfig(sdkConfig)
+
+	createQueueResult, _ := sqsClient.CreateQueue(context.TODO(), &sqs.CreateQueueInput{
+		QueueName: &af.QueueName,
+	})
+
+	topicName := aws.String("unit-topic2")
+
+	createTopicResult, _ := snsClient.CreateTopic(context.TODO(), &sns.CreateTopicInput{
+		Name: topicName,
+	})
+
+	snsClient.Subscribe(context.TODO(), &sns.SubscribeInput{
+		Protocol:              aws.String("sqs"),
+		TopicArn:              createTopicResult.TopicArn,
+		Attributes:            map[string]string{},
+		Endpoint:              createQueueResult.QueueUrl,
+		ReturnSubscriptionArn: true,
+	})
+	message := "{\"IAm\": \"aMessage\"}"
+	subject := "I am a subject"
+	attributes := map[string]types.MessageAttributeValue{
+		"someKey": {
+			BinaryValue: []byte(message),
+			DataType:    aws.String("Binary"),
+		},
+	}
+
+	publishResponse, publishErr := snsClient.Publish(context.TODO(), &sns.PublishInput{
+		TopicArn:          createTopicResult.TopicArn,
+		Message:           &message,
+		Subject:           &subject,
+		MessageAttributes: attributes,
+	})
+
+	receiveMessageResponse, receiveErr := sqsClient.ReceiveMessage(context.TODO(), &sqs.ReceiveMessageInput{
+		QueueUrl: createQueueResult.QueueUrl,
+	})
+
+	type Message struct {
+		Message string `json:"Message"`
+		Subject string `json:"Subject"`
+	}
+
+	var receiveMessage Message
+
+	assert.Nil(t, publishErr)
+	assert.NotNil(t, publishResponse)
+
+	assert.Nil(t, receiveErr)
+	assert.NotNil(t, receiveMessageResponse)
+
+	body := *receiveMessageResponse.Messages[0].Body
+	json.Unmarshal([]byte(body), &receiveMessage)
+	assert.Equal(t, message, receiveMessage.Message)
+	assert.Equal(t, subject, receiveMessage.Subject)
+}
+
 func Test_Publish_sqs_json_not_raw(t *testing.T) {
 	server := generateServer()
 	defaultEnv := app.CurrentEnvironment