Merged in feature/docinit (pull request #43)

Move queue to config

* movequeue

* passtests

internal/test/queue.go

@@ -3,8 +3,8 @@ package test
 import (
 	"context"
 	"fmt"
-	"queryorchestration/internal/server/queue"
 	"queryorchestration/internal/serviceconfig"
+	"queryorchestration/internal/serviceconfig/queue"
 	"testing"
 	"time"
 
@@ -131,10 +131,10 @@ func CreateQueue(t *testing.T, ctx context.Context, cfg *serviceconfig.BaseConfi
 	return *queueM.QueueUrl
 }
 
-func AssertMessageWait(t *testing.T, ctx context.Context, cfg *queue.Config, attrs []string) types.Message {
+func AssertMessageWait(t *testing.T, ctx context.Context, cfg serviceconfig.ConfigProvider, params *queue.ReceiveParams) types.Message {
 	time.Sleep(1 * time.Second)
 
-	result, err := queue.Receive(ctx, cfg, attrs)
+	result, err := cfg.ReceiveFromQueue(ctx, params)
 	assert.NoError(t, err)
 	assert.NotNil(t, result.Messages)
 	assert.Len(t, result.Messages, 1)
@@ -143,14 +143,19 @@ func AssertMessageWait(t *testing.T, ctx context.Context, cfg *queue.Config, att
 	return result.Messages[0]
 }
 
-func AssertMessageBodyWait(t *testing.T, ctx context.Context, cfg *queue.Config, body string) {
-	message := AssertMessageWait(t, ctx, cfg, []string{})
+func AssertMessageBodyWait(t *testing.T, ctx context.Context, cfg serviceconfig.ConfigProvider, url string, body string) {
+	message := AssertMessageWait(t, ctx, cfg, &queue.ReceiveParams{
+		QueueURL: url,
+	})
 
 	assert.Equal(t, body, *message.Body)
 }
 
-func AssertMessageAttrWait(t *testing.T, ctx context.Context, cfg *queue.Config, name string, value string) {
-	message := AssertMessageWait(t, ctx, cfg, []string{name})
+func AssertMessageAttrWait(t *testing.T, ctx context.Context, cfg serviceconfig.ConfigProvider, url string, name string, value string) {
+	message := AssertMessageWait(t, ctx, cfg, &queue.ReceiveParams{
+		QueueURL:   url,
+		Attributes: []string{name},
+	})
 
 	assert.NotNil(t, message.MessageAttributes[name])
 	assert.Equal(t, value, *(message.MessageAttributes[name]).StringValue)