Merge remote-tracking branch 'origin/feature/dynamo-query'

# Conflicts:
#	cmd/dynamo-browse/main.go
#	cmd/ssm-browse/main.go
#	docker-compose.yml
#	internal/dynamo-browse/ui/model.go
#	test/cmd/load-test-table/main.go

test/cmd/load-test-table/main.go

@@ -2,24 +2,24 @@ package main
 
 import (
 	"context"
-	"github.com/brianvoe/gofakeit/v6"
-	"github.com/google/uuid"
-	"log"
-
+	"fmt"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
+	"github.com/brianvoe/gofakeit/v6"
+	"github.com/google/uuid"
 	"github.com/lmika/awstools/internal/dynamo-browse/models"
 	"github.com/lmika/awstools/internal/dynamo-browse/providers/dynamo"
 	"github.com/lmika/awstools/internal/dynamo-browse/services/tables"
 	"github.com/lmika/gopkgs/cli"
+	"log"
 )
 
 func main() {
 	ctx := context.Background()
-	tableName := "awstools-test"
-	totalItems := 300
+	tableName := "business-addresses"
+	totalItems := 5000
 
 	cfg, err := config.LoadDefaultConfig(ctx)
 	if err != nil {
@@ -66,13 +66,19 @@ func main() {
 	for i := 0; i < totalItems; i++ {
 		key := uuid.New().String()
 		if err := tableService.Put(ctx, tableInfo, models.Item{
-			"pk":      &types.AttributeValueMemberS{Value: key},
-			"sk":      &types.AttributeValueMemberS{Value: key},
-			"name":    &types.AttributeValueMemberS{Value: gofakeit.Name()},
-			"address": &types.AttributeValueMemberS{Value: gofakeit.Address().Address},
-			"city":    &types.AttributeValueMemberS{Value: gofakeit.Address().City},
-			"phone":   &types.AttributeValueMemberS{Value: gofakeit.Phone()},
-			"web":     &types.AttributeValueMemberS{Value: gofakeit.URL()},
+			"pk":           &types.AttributeValueMemberS{Value: key},
+			"sk":           &types.AttributeValueMemberS{Value: key},
+			"name":         &types.AttributeValueMemberS{Value: gofakeit.Name()},
+			"address":      &types.AttributeValueMemberS{Value: gofakeit.Address().Address},
+			"city":         &types.AttributeValueMemberS{Value: gofakeit.Address().City},
+			"phone":        &types.AttributeValueMemberN{Value: gofakeit.Phone()},
+			"web":          &types.AttributeValueMemberS{Value: gofakeit.URL()},
+			"officeOpened": &types.AttributeValueMemberBOOL{Value: gofakeit.Bool()},
+			"ratings": &types.AttributeValueMemberL{Value: []types.AttributeValue{
+				&types.AttributeValueMemberN{Value: fmt.Sprint(gofakeit.IntRange(0, 5))},
+				&types.AttributeValueMemberN{Value: fmt.Sprint(gofakeit.IntRange(0, 5))},
+				&types.AttributeValueMemberN{Value: fmt.Sprint(gofakeit.IntRange(0, 5))},
+			}},
 		}); err != nil {
 			log.Fatalln(err)
 		}

test/testdynamo/client.go

@@ -13,9 +13,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type TestData []map[string]interface{}
+type TestData struct {
+	TableName string
+	Data      []map[string]interface{}
+}
 
-func SetupTestTable(t *testing.T, tableName string, testData TestData) (*dynamodb.Client, func()) {
+func SetupTestTable(t *testing.T, testData []TestData) (*dynamodb.Client, func()) {
 	t.Helper()
 	ctx := context.Background()
 
@@ -25,39 +28,45 @@ func SetupTestTable(t *testing.T, tableName string, testData TestData) (*dynamod
 	assert.NoError(t, err)
 
 	dynamoClient := dynamodb.NewFromConfig(cfg,
-		dynamodb.WithEndpointResolver(dynamodb.EndpointResolverFromURL("http://localhost:8000")))
+		dynamodb.WithEndpointResolver(dynamodb.EndpointResolverFromURL("http://localhost:18000")))
 
-	_, err = dynamoClient.CreateTable(ctx, &dynamodb.CreateTableInput{
-		TableName: aws.String(tableName),
-		KeySchema: []types.KeySchemaElement{
-			{AttributeName: aws.String("pk"), KeyType: types.KeyTypeHash},
-			{AttributeName: aws.String("sk"), KeyType: types.KeyTypeRange},
-		},
-		AttributeDefinitions: []types.AttributeDefinition{
-			{AttributeName: aws.String("pk"), AttributeType: types.ScalarAttributeTypeS},
-			{AttributeName: aws.String("sk"), AttributeType: types.ScalarAttributeTypeS},
-		},
-		ProvisionedThroughput: &types.ProvisionedThroughput{
-			ReadCapacityUnits:  aws.Int64(100),
-			WriteCapacityUnits: aws.Int64(100),
-		},
+	for _, table := range testData {
+		_, err = dynamoClient.CreateTable(ctx, &dynamodb.CreateTableInput{
+			TableName: aws.String(table.TableName),
+			KeySchema: []types.KeySchemaElement{
+				{AttributeName: aws.String("pk"), KeyType: types.KeyTypeHash},
+				{AttributeName: aws.String("sk"), KeyType: types.KeyTypeRange},
+			},
+			AttributeDefinitions: []types.AttributeDefinition{
+				{AttributeName: aws.String("pk"), AttributeType: types.ScalarAttributeTypeS},
+				{AttributeName: aws.String("sk"), AttributeType: types.ScalarAttributeTypeS},
+			},
+			ProvisionedThroughput: &types.ProvisionedThroughput{
+				ReadCapacityUnits:  aws.Int64(100),
+				WriteCapacityUnits: aws.Int64(100),
+			},
+		})
+		assert.NoError(t, err)
+
+		for _, item := range table.Data {
+			m, err := attributevalue.MarshalMap(item)
+			assert.NoError(t, err)
+
+			_, err = dynamoClient.PutItem(ctx, &dynamodb.PutItemInput{
+				TableName: aws.String(table.TableName),
+				Item:      m,
+			})
+			assert.NoError(t, err)
+		}
+	}
+
+	t.Cleanup(func() {
+		for _, table := range testData {
+			dynamoClient.DeleteTable(ctx, &dynamodb.DeleteTableInput{
+				TableName: aws.String(table.TableName),
+			})
+		}
 	})
-	assert.NoError(t, err)
 
-	for _, item := range testData {
-		m, err := attributevalue.MarshalMap(item)
-		assert.NoError(t, err)
-
-		_, err = dynamoClient.PutItem(ctx, &dynamodb.PutItemInput{
-			TableName: aws.String(tableName),
-			Item:      m,
-		})
-		assert.NoError(t, err)
-	}
-
-	return dynamoClient, func() {
-		dynamoClient.DeleteTable(ctx, &dynamodb.DeleteTableInput{
-			TableName: aws.String(tableName),
-		})
-	}
+	return dynamoClient, func() {}
 }