Merged in feature/docinit (pull request #43)

Move queue to config

* movequeue

* passtests

internal/test/queue_test.go

@@ -2,7 +2,7 @@ package test
 
 import (
 	"context"
-	"queryorchestration/internal/server/queue"
+	"queryorchestration/internal/serviceconfig/queue"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -73,15 +73,15 @@ func TestAssertMessageWait(t *testing.T) {
 	defer cleanup()
 	url := CreateQueue(t, ctx, cfg, "myname")
 
-	qucfg := &queue.Config{
-		URL:    url,
-		Client: cfg.QueueClient,
-	}
-
-	err := queue.Send(ctx, qucfg, "body", map[string]types.MessageAttributeValue{})
+	err := cfg.SendToQueue(ctx, &queue.SendParams{
+		QueueURL: url,
+		Body:     "body",
+	})
 	assert.NoError(t, err)
 
-	msg := AssertMessageWait(t, ctx, qucfg, []string{})
+	msg := AssertMessageWait(t, ctx, cfg, &queue.ReceiveParams{
+		QueueURL: url,
+	})
 	assert.NotNil(t, msg)
 }
 
@@ -99,15 +99,13 @@ func TestAssertMessageBodyWait(t *testing.T) {
 	defer cleanup()
 	url := CreateQueue(t, ctx, cfg, "myname")
 
-	qucfg := &queue.Config{
-		URL:    url,
-		Client: cfg.QueueClient,
-	}
-
-	err := queue.Send(ctx, qucfg, "body", map[string]types.MessageAttributeValue{})
+	err := cfg.SendToQueue(ctx, &queue.SendParams{
+		QueueURL: url,
+		Body:     "body",
+	})
 	assert.NoError(t, err)
 
-	AssertMessageBodyWait(t, ctx, qucfg, "\"body\"")
+	AssertMessageBodyWait(t, ctx, cfg, url, "\"body\"")
 }
 
 func TestAssertMessageAttrWait(t *testing.T) {
@@ -124,21 +122,20 @@ func TestAssertMessageAttrWait(t *testing.T) {
 	defer cleanup()
 	url := CreateQueue(t, ctx, cfg, "myname")
 
-	qucfg := &queue.Config{
-		URL:    url,
-		Client: cfg.QueueClient,
-	}
-
 	name := "name"
 	value := "value"
 
-	err := queue.Send(ctx, qucfg, "body", map[string]types.MessageAttributeValue{
-		name: {
-			DataType:    aws.String("String"),
-			StringValue: aws.String(value),
+	err := cfg.SendToQueue(ctx, &queue.SendParams{
+		QueueURL: url,
+		Body:     "body",
+		Attributes: map[string]types.MessageAttributeValue{
+			name: {
+				DataType:    aws.String("String"),
+				StringValue: aws.String(value),
+			},
 		},
 	})
 	assert.NoError(t, err)
 
-	AssertMessageAttrWait(t, ctx, qucfg, name, value)
+	AssertMessageAttrWait(t, ctx, cfg, url, name, value)
 }