Skip to content

Commit 1a65ad3

Browse files
rowanseymourrowanseymour
committed
Add basic dynamodb service
1 parent a1147be commit 1a65ad3

File tree

6 files changed

+109
-2
lines changed

6 files changed

+109
-2
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
- name: Install Linux packages
3939
run: sudo apt install -y --no-install-recommends pandoc
4040

41+
- name: Install and start DynamoDB
42+
uses: rrainn/[email protected]
43+
4144
- name: Install Go
4245
uses: actions/setup-go@v5
4346
with:

‎aws/dynamo/service.go

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package dynamo
2+
3+
import (
4+
"context"
5+
6+
"github.com/aws/aws-sdk-go-v2/aws"
7+
"github.com/aws/aws-sdk-go-v2/config"
8+
"github.com/aws/aws-sdk-go-v2/credentials"
9+
"github.com/aws/aws-sdk-go-v2/service/dynamodb"
10+
)
11+
12+
// Service is simple abstraction layer to work with a DynamoDB-compatible database
13+
type Service struct {
14+
Client *dynamodb.Client
15+
tablePrefix string
16+
}
17+
18+
// NewService creates a new S3 service with the given credentials and configuration
19+
func NewService(accessKey, secretKey, region, endpoint, tablePrefix string) (*Service, error) {
20+
opts := []func(*config.LoadOptions) error{config.WithRegion(region)}
21+
22+
if accessKey != "" && secretKey != "" {
23+
opts = append(opts, config.WithCredentialsProvider(credentials.StaticCredentialsProvider{Value: aws.Credentials{
24+
AccessKeyID: accessKey, SecretAccessKey: secretKey,
25+
}}))
26+
}
27+
28+
cfg, err := config.LoadDefaultConfig(context.TODO(), opts...)
29+
if err != nil {
30+
return nil, err
31+
}
32+
33+
client := dynamodb.NewFromConfig(cfg, func(o *dynamodb.Options) {
34+
if endpoint != "" {
35+
o.BaseEndpoint = aws.String(endpoint)
36+
}
37+
})
38+
39+
return &Service{Client: client, tablePrefix: tablePrefix}, nil
40+
}
41+
42+
func (s *Service) Test(ctx context.Context, table string) error {
43+
_, err := s.Client.DescribeTable(ctx, &dynamodb.DescribeTableInput{TableName: aws.String(s.TableName(table))})
44+
return err
45+
}
46+
47+
func (s *Service) TableName(base string) string {
48+
return s.tablePrefix + base
49+
}

‎aws/dynamo/service_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package dynamo_test
2+
3+
import (
4+
"context"
5+
"testing"
6+
7+
"github.com/aws/aws-sdk-go-v2/aws"
8+
"github.com/aws/aws-sdk-go-v2/service/dynamodb"
9+
"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
10+
"github.com/nyaruka/gocommon/aws/dynamo"
11+
"github.com/stretchr/testify/assert"
12+
)
13+
14+
func TestService(t *testing.T) {
15+
ctx := context.Background()
16+
17+
svc, err := dynamo.NewService("root", "tembatemba", "us-east-1", "http://localhost:6000", "Test")
18+
assert.NoError(t, err)
19+
20+
err = svc.Test(ctx, "Things")
21+
assert.ErrorContains(t, err, "ResourceNotFoundException")
22+
23+
_, err = svc.Client.CreateTable(ctx, &dynamodb.CreateTableInput{
24+
TableName: aws.String("TestThings"),
25+
KeySchema: []types.KeySchemaElement{
26+
{AttributeName: aws.String("UUID"), KeyType: types.KeyTypeHash},
27+
},
28+
AttributeDefinitions: []types.AttributeDefinition{
29+
{AttributeName: aws.String("UUID"), AttributeType: types.ScalarAttributeTypeS},
30+
},
31+
BillingMode: types.BillingModePayPerRequest,
32+
})
33+
assert.NoError(t, err)
34+
35+
err = svc.Test(ctx, "Things")
36+
assert.NoError(t, err)
37+
38+
_, err = svc.Client.DeleteTable(ctx, &dynamodb.DeleteTableInput{TableName: aws.String("TestThings")})
39+
assert.NoError(t, err)
40+
}

‎aws/s3x/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ func NewService(accessKey, secretKey, region, endpoint string, minio bool) (*Ser
4444
}
4545

4646
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
47-
o.UsePathStyle = minio // urls as endpoint/bucket/key instead of bucket.endpoint/key
48-
4947
if endpoint != "" {
5048
o.BaseEndpoint = aws.String(endpoint)
5149
}
50+
51+
o.UsePathStyle = minio // urls as endpoint/bucket/key instead of bucket.endpoint/key
5252
})
5353

5454
return &Service{Client: client, urler: urler}, nil

‎go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require (
66
github.com/aws/aws-sdk-go-v2 v1.30.4
77
github.com/aws/aws-sdk-go-v2/config v1.27.28
88
github.com/aws/aws-sdk-go-v2/credentials v1.17.28
9+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5
910
github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0
1011
github.com/gabriel-vasile/mimetype v1.4.5
1112
github.com/go-chi/chi/v5 v5.1.0
@@ -35,6 +36,7 @@ require (
3536
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
3637
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
3738
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.17 // indirect
3840
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
3941
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
4042
github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
@@ -44,6 +46,7 @@ require (
4446
github.com/davecgh/go-spew v1.1.1 // indirect
4547
github.com/go-playground/locales v0.14.1 // indirect
4648
github.com/go-playground/universal-translator v0.18.1 // indirect
49+
github.com/jmespath/go-jmespath v0.4.0 // indirect
4750
github.com/leodido/go-urn v1.4.0 // indirect
4851
github.com/pmezard/go-difflib v1.0.0 // indirect
4952
golang.org/x/crypto v0.25.0 // indirect

‎go.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK
1818
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
1919
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc=
2020
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY=
21+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5 h1:Cm77yt+/CV7A6DglkENsWA3H1hq8+4ItJnFKrhxHkvg=
22+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5/go.mod h1:s2fYaueBuCnwv1XQn6T8TfShxJWusv5tWPMcL+GY6+g=
2123
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI=
2224
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc=
2325
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM=
2426
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18/go.mod h1:Br6+bxfG33Dk3ynmkhsW2Z/t9D4+lRqdLDNCKi85w0U=
27+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.17 h1:HDJGz1jlV7RokVgTPfx1UHBHANC0N5Uk++xgyYgz5E0=
28+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.17/go.mod h1:5szDu6TWdRDytfDxUQVv2OYfpTQMKApVFyqpm+TcA98=
2529
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHCiSH0jyd6gROjlJtNwov0eGYNz8s8nFcR0jQ=
2630
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c=
2731
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I=
@@ -36,6 +40,7 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhje
3640
github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0=
3741
github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4=
3842
github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
43+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3944
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4045
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4146
github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
@@ -60,6 +65,10 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
6065
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
6166
github.com/jellydator/ttlcache/v3 v3.2.0 h1:6lqVJ8X3ZaUwvzENqPAobDsXNExfUJd61u++uW8a3LE=
6267
github.com/jellydator/ttlcache/v3 v3.2.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4=
68+
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
69+
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
70+
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
71+
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
6372
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
6473
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
6574
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -78,6 +87,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
7887
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7988
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
8089
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
90+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
8191
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
8292
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
8393
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
@@ -98,5 +108,7 @@ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6h
98108
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
99109
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
100110
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
111+
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
112+
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
101113
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
102114
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)