From a4e9cf9a5a7e84b43424f742a5391b94ef5faea5 Mon Sep 17 00:00:00 2001 From: Jonathan Wilsson Date: Sat, 8 Apr 2023 11:21:30 +0200 Subject: [PATCH] Use generic GetDynamodbData util --- go.mod | 2 +- go.sum | 4 ++-- image.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fc4bf6a..a683aed 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/aws/aws-lambda-go v1.34.1 github.com/aws/aws-sdk-go-v2/config v1.18.19 - github.com/jwilsson/go-bot-utils v1.13.1 + github.com/jwilsson/go-bot-utils v1.14.0 github.com/slack-go/slack v0.11.3 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 ) diff --git a/go.sum b/go.sum index a33a1e2..c68cce6 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jwilsson/go-bot-utils v1.13.1 h1:VuCzp5IIx3Us0zZGyfRp9IKXuyZ79A1NcYBJjh1f++A= -github.com/jwilsson/go-bot-utils v1.13.1/go.mod h1:D8HwnB+CpO0Qt5+q4+MgvoDV+eSn62mDwF043nPJn/I= +github.com/jwilsson/go-bot-utils v1.14.0 h1:YdX+wGY2WmvcHH9FpjhSUyAN+SjC2DsQEuW8cIGp3XM= +github.com/jwilsson/go-bot-utils v1.14.0/go.mod h1:D8HwnB+CpO0Qt5+q4+MgvoDV+eSn62mDwF043nPJn/I= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rickar/cal/v2 v2.1.7 h1:2ePuyYfK828ei33IEOuqwDUVsup2wLNxwV+vQdfzrq8= diff --git a/image.go b/image.go index cb3db18..a0ab2a5 100644 --- a/image.go +++ b/image.go @@ -15,15 +15,15 @@ type Image struct { ImageURL string `json:"image_url" dynamodbav:"image_url"` } -func getImages(ctx context.Context, tableName string) (images []Image, err error) { +func getImages(ctx context.Context, tableName string) ([]Image, error) { cfg, err := config.LoadDefaultConfig(ctx) if err != nil { - return images, err + return nil, err } - err = utils.GetDynamodbData(ctx, cfg, tableName, &images) + images, err := utils.GetDynamodbData[Image](ctx, cfg, tableName) if err != nil { - return images, err + return nil, err } sort.Slice(images, func(i int, j int) bool {