add id (required) to publish entries

Admiral-Piett · Aug 29, 2024 · deedeb9 · deedeb9
1 parent 07b9b9b
commit deedeb9
Showing 1 changed file with 51 additions and 10 deletions.
diff --git a/smoke_tests/sns_publish_batch_test.go b/smoke_tests/sns_publish_batch_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sns"
 	"github.com/aws/aws-sdk-go-v2/service/sns/types"
 	"github.com/gavv/httpexpect/v2"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -37,22 +38,26 @@ func Test_Publish_batch_sqs_json_raw(t *testing.T) {
 	topicArn := app.SyncTopics.Topics["unit-topic1"].Arn
 	message := "{\"IAm\": \"aMessage\"}"
 	subject := "I am a subject"
+	id1 := uuid.NewString()
+	id2 := uuid.NewString()
 	response, err := snsClient.PublishBatch(context.TODO(), &sns.PublishBatchInput{
 		TopicArn: &topicArn,
 		PublishBatchRequestEntries: []types.PublishBatchRequestEntry{
 			{
+				Id:      &id1,
 				Message: &message,
 				Subject: &subject,
 			},
 			{
+				Id:      &id2,
 				Message: &message,
 				Subject: &subject,
 			},
 		},
 	})
 
-	assert.Nil(t, err)
-	assert.NotNil(t, response)
+	require.Nil(t, err)
+	require.NotNil(t, response)
 
 	messages := app.SyncQueues.Queues["subscribed-queue1"].Messages
 	require.Len(t, messages, 2)
@@ -77,22 +82,26 @@ func Test_Publish_batch_sqs_json_not_raw(t *testing.T) {
 	topicArn := app.SyncTopics.Topics["unit-topic3"].Arn
 	message := "{\"IAm\": \"aMessage\"}"
 	subject := "I am a subject"
+	id1 := uuid.NewString()
+	id2 := uuid.NewString()
 	response, err := snsClient.PublishBatch(context.TODO(), &sns.PublishBatchInput{
 		TopicArn: &topicArn,
 		PublishBatchRequestEntries: []types.PublishBatchRequestEntry{
 			{
+				Id:      &id1,
 				Message: &message,
 				Subject: &subject,
 			},
 			{
+				Id:      &id2,
 				Message: &message,
 				Subject: &subject,
 			},
 		},
 	})
 
-	assert.Nil(t, err)
-	assert.NotNil(t, response)
+	require.Nil(t, err)
+	require.NotNil(t, response)
 
 	messages := app.SyncQueues.Queues["subscribed-queue3"].Messages
 	assert.Len(t, messages, 2)
@@ -143,21 +152,25 @@ func Test_Publish_batch_http_json(t *testing.T) {
 
 	topicArn := app.SyncTopics.Topics["unit-topic-http"].Arn
 	message := "{\"IAm\": \"aMessage\"}"
+	id1 := uuid.NewString()
+	id2 := uuid.NewString()
 	response, err := snsClient.PublishBatch(context.TODO(), &sns.PublishBatchInput{
 		TopicArn: &topicArn,
 
 		PublishBatchRequestEntries: []types.PublishBatchRequestEntry{
 			{
+				Id:      &id1,
 				Message: &message,
 			},
 			{
+				Id:      &id2,
 				Message: &message,
 			},
 		},
 	})
 
-	assert.Nil(t, err)
-	assert.NotNil(t, response)
+	require.Nil(t, err)
+	require.NotNil(t, response)
 
 	assert.True(t, called)
 	assert.Equal(t, "\"{\\\"IAm\\\": \\\"aMessage\\\"}\"", httpMessage)
@@ -197,21 +210,25 @@ func Test_Publish_batch_https_json_raw(t *testing.T) {
 
 	topicArn := app.SyncTopics.Topics["unit-topic-http"].Arn
 	message := "{\"IAm\": \"aMessage\"}"
+	id1 := uuid.NewString()
+	id2 := uuid.NewString()
 	response, err := snsClient.PublishBatch(context.TODO(), &sns.PublishBatchInput{
 		TopicArn: &topicArn,
 
 		PublishBatchRequestEntries: []types.PublishBatchRequestEntry{
 			{
+				Id:      &id1,
 				Message: &message,
 			},
 			{
+				Id:      &id2,
 				Message: &message,
 			},
 		},
 	})
 
-	assert.Nil(t, err)
-	assert.NotNil(t, response)
+	require.Nil(t, err)
+	require.NotNil(t, response)
 
 	assert.True(t, called)
 	assert.Equal(t, "\"{\\\"IAm\\\": \\\"aMessage\\\"}\"", httpMessage)
@@ -253,22 +270,26 @@ func Test_Publish_batch_https_json_not_raw(t *testing.T) {
 	topicArn := app.SyncTopics.Topics["unit-topic-http"].Arn
 	message := "{\"IAm\": \"aMessage\"}"
 	subject := "I am a subject"
+	id1 := uuid.NewString()
+	id2 := uuid.NewString()
 	response, err := snsClient.PublishBatch(context.TODO(), &sns.PublishBatchInput{
 		TopicArn: &topicArn,
 		PublishBatchRequestEntries: []types.PublishBatchRequestEntry{
 			{
+				Id:      &id1,
 				Message: &message,
 				Subject: &subject,
 			},
 			{
+				Id:      &id2,
 				Message: &message,
 				Subject: &subject,
 			},
 		},
 	})
 
-	assert.Nil(t, err)
-	assert.NotNil(t, response)
+	require.Nil(t, err)
+	require.NotNil(t, response)
 
 	assert.True(t, called)
 	assert.Contains(t, httpMessage, "\"Message\":\"{\\\"IAm\\\": \\\"aMessage\\\"}\"")
@@ -303,21 +324,25 @@ func Test_Publish_batch_sqs_xml_raw(t *testing.T) {
 		Action                     string `schema:"Action"`
 		TopicArn                   string `schema:"TopicArn"`
 		PublishBatchRequestEntries []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		} `schema:"PublishBatchRequestEntries"`
 	}{
 		Action:   "PublishBatch",
 		TopicArn: topicArn,
 		PublishBatchRequestEntries: []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		}{
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
@@ -356,21 +381,25 @@ func Test_Publish_batch_sqs_xml_not_raw(t *testing.T) {
 		Action                     string `schema:"Action"`
 		TopicArn                   string `schema:"TopicArn"`
 		PublishBatchRequestEntries []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		} `schema:"PublishBatchRequestEntries"`
 	}{
 		Action:   "PublishBatch",
 		TopicArn: topicArn,
 		PublishBatchRequestEntries: []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		}{
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
@@ -436,21 +465,25 @@ func Test_Publish_batch_http_xml(t *testing.T) {
 		Action                     string `schema:"Action"`
 		TopicArn                   string `schema:"TopicArn"`
 		PublishBatchRequestEntries []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		} `schema:"PublishBatchRequestEntries"`
 	}{
 		Action:   "PublishBatch",
 		TopicArn: topicArn,
 		PublishBatchRequestEntries: []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		}{
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
@@ -505,21 +538,25 @@ func Test_Publish_batch_https_xml_raw(t *testing.T) {
 		Action                     string `schema:"Action"`
 		TopicArn                   string `schema:"TopicArn"`
 		PublishBatchRequestEntries []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		} `schema:"PublishBatchRequestEntries"`
 	}{
 		Action:   "PublishBatch",
 		TopicArn: topicArn,
 		PublishBatchRequestEntries: []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		}{
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
@@ -575,21 +612,25 @@ func Test_Publish_batch_https_xml_not_raw(t *testing.T) {
 		Action                     string `schema:"Action"`
 		TopicArn                   string `schema:"TopicArn"`
 		PublishBatchRequestEntries []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		} `schema:"PublishBatchRequestEntries"`
 	}{
 		Action:   "PublishBatch",
 		TopicArn: topicArn,
 		PublishBatchRequestEntries: []struct {
+			Id      string `schema:"Id"`
 			Message string `schema:"Message"`
 			Subject string `schema:"Subject"`
 		}{
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},
 			{
+				Id:      uuid.NewString(),
 				Message: message,
 				Subject: subject,
 			},