Merged in feature/docinit (pull request #43)

Move queue to config

* movequeue

* passtests

test/docInitRunner/docinitrunner_test.go

@@ -5,12 +5,11 @@ import (
 	"os"
 	"path"
 	documentinit "queryorchestration/internal/document/init"
-	"queryorchestration/internal/server/queue"
+	"queryorchestration/internal/serviceconfig/queue"
 	"queryorchestration/internal/test"
 	queryservice "queryorchestration/pkg/queryService"
 	"testing"
 
-	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -76,16 +75,13 @@ func TestDocInitRunner(t *testing.T) {
 		Location: "/I/am/here", // TODO
 	}
 
-	qcfg := &queue.Config{
-		URL:    net.Runners[test.DocInitRunner].URI,
-		Client: cfg.QueueClient,
-	}
-
-	err = queue.Send(ctx, qcfg, document, map[string]types.MessageAttributeValue{})
+	err = cfg.SendToQueue(ctx, &queue.SendParams{
+		QueueURL: net.Runners[test.DocInitRunner].URI,
+		Body:     document,
+	})
 	assert.NoError(t, err)
 
-	_ = test.AssertMessageWait(t, ctx, &queue.Config{
-		URL:    doccleanurl,
-		Client: cfg.GetQueueClient(),
-	}, []string{})
+	_ = test.AssertMessageWait(t, ctx, cfg, &queue.ReceiveParams{
+		QueueURL: doccleanurl,
+	})
 }

test/queryRunner/queryrunner_test.go

@@ -3,11 +3,10 @@ package integration_test
 import (
 	"context"
 	"queryorchestration/internal/query"
-	"queryorchestration/internal/server/queue"
+	"queryorchestration/internal/serviceconfig/queue"
 	"queryorchestration/internal/test"
 	"testing"
 
-	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 )
@@ -29,12 +28,11 @@ func TestQueryRunner(t *testing.T) {
 		CleanVersion: int32(1),
 		TextVersion:  int32(1),
 	}
-	qcfg := &queue.Config{
-		URL:    c.URI,
-		Client: cfg.QueueClient,
-	}
 
-	err := queue.Send(ctx, qcfg, document, map[string]types.MessageAttributeValue{})
+	err := cfg.SendToQueue(ctx, &queue.SendParams{
+		QueueURL: c.URI,
+		Body:     document,
+	})
 	assert.NoError(t, err)
 
 	// TODO - check document output