Merged in feature/docclean (pull request #55)

Doc Clean Structure

* outline

* isdocclean

* placeholder for clean log

* versionplustesting

* versionplustesting

* testspassed

test/process_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig"
 	"queryorchestration/internal/serviceconfig/objectstore"
 	documentcleanc "queryorchestration/internal/serviceconfig/queue/documentclean"
 	"queryorchestration/internal/test"
@@ -19,19 +19,19 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type DocInitConfig struct {
-	runner.BaseConfig
+type ProcessConfig struct {
+	serviceconfig.BaseConfig
 	documentcleanc.DocCleanConfig
 	objectstore.ObjectStoreConfig
 }
 
-func TestDocInitRunner(t *testing.T) {
+func TestProcess(t *testing.T) {
 	t.SkipNow()
 	ctx := context.Background()
 
-	cfg := &DocInitConfig{}
+	cfg := &ProcessConfig{}
 	test.SetCfgProvider(t, cfg)
-	cfg.SetBasePath(path.Join(os.Getenv("PWD"), "../.."))
+	cfg.SetBasePath(path.Join(os.Getenv("PWD"), ".."))
 
 	network, ncleanup := test.CreateNetwork(t, ctx)
 	defer ncleanup()
@@ -46,7 +46,6 @@ func TestDocInitRunner(t *testing.T) {
 	assert.NoError(t, err)
 	test.CreateStoreClient(t, ctx, cfg, acfg.ExternalEndpoint)
 
-	doccleanurl := test.CreateQueue(t, ctx, cfg, "docclean")
 	bucketName := "docinitbucket"
 	test.CreateBucket(t, ctx, cfg, bucketName)
 	arn := fmt.Sprintf("arn:aws:sqs:%s:000000000000:%s", cfg.AWSRegion, test.DocInitRunner)
@@ -65,6 +64,9 @@ func TestDocInitRunner(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
+	doccleanurl := test.CreateQueue(t, ctx, cfg, test.DocCleanRunner)
+	doctexturl := test.CreateQueue(t, ctx, cfg, "doctextrunner")
+
 	net, cleanup := test.CreateRunnersAndServicesNetwork(t, ctx, &test.EcosystemNetworkConfig{
 		Cfg:     cfg,
 		Network: network,
@@ -75,6 +77,12 @@ func TestDocInitRunner(t *testing.T) {
 					"DOCUMENT_CLEAN_URL": doccleanurl,
 				},
 			},
+			{
+				Name: test.DocCleanRunner,
+				Env: map[string]string{
+					"DOCUMENT_TEXT_URL": doctexturl,
+				},
+			},
 		},
 		Services: []*test.ServiceNetworkConfig{
 			{
@@ -116,5 +124,5 @@ func TestDocInitRunner(t *testing.T) {
 	assert.NoError(t, err)
 
 	resRegex := regexp.MustCompile(`{"id": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"`)
-	test.AssertMessageBody(t, ctx, cfg, doccleanurl, resRegex)
+	test.AssertMessageBody(t, ctx, cfg, doctexturl, resRegex)
 }

test/queryRunner/queryrunner_test.go

@@ -1,41 +0,0 @@
-package integration_test
-
-import (
-	"context"
-	"queryorchestration/internal/query"
-	"queryorchestration/internal/serviceconfig"
-	"queryorchestration/internal/serviceconfig/queue"
-	"queryorchestration/internal/test"
-	"testing"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestQueryRunner(t *testing.T) {
-	ctx := context.Background()
-
-	cfg := &serviceconfig.BaseConfig{}
-	test.SetCfgProvider(t, cfg)
-
-	c, cleanup := test.CreateRunnerNetwork(t, ctx, &test.RunnerNetworkConfig{
-		Cfg:  cfg,
-		Name: test.QueryRunner,
-	})
-	defer cleanup()
-
-	document := query.Document{
-		ID:           uuid.New(),
-		JobID:        uuid.New(),
-		CleanVersion: int32(1),
-		TextVersion:  int32(1),
-	}
-
-	err := cfg.SendToQueue(ctx, &queue.SendParams{
-		QueueURL: c.URI,
-		Body:     document,
-	})
-	assert.NoError(t, err)
-
-	// TODO - check document output
-}