Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Commit 5bc7bc3

Browse files
authored
fix: Download payload from S3 bucket to avoid payload limit (#10)
1 parent ccfb6ab commit 5bc7bc3

File tree

4 files changed

+94
-3
lines changed

4 files changed

+94
-3
lines changed

go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ go 1.18
44

55
require (
66
github.com/aws/aws-lambda-go v1.30.0 // indirect
7+
github.com/aws/aws-sdk-go v1.44.14 // indirect
78
github.com/go-stack/stack v1.8.0 // indirect
89
github.com/golang/snappy v0.0.1 // indirect
10+
github.com/jmespath/go-jmespath v0.4.0 // indirect
911
github.com/klauspost/compress v1.13.6 // indirect
1012
github.com/pkg/errors v0.9.1 // indirect
1113
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -15,5 +17,5 @@ require (
1517
go.mongodb.org/mongo-driver v1.9.0 // indirect
1618
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
1719
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
18-
golang.org/x/text v0.3.5 // indirect
20+
golang.org/x/text v0.3.7 // indirect
1921
)

go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
github.com/aws/aws-lambda-go v1.30.0 h1:qelHgOUidrQmrfFTLiC7u6wWuuwBJ9yKcjVRkIy7834=
22
github.com/aws/aws-lambda-go v1.30.0/go.mod h1:IF5Q7wj4VyZyUFnZ54IQqeWtctHQ9tz+KhcbDenr220=
3+
github.com/aws/aws-sdk-go v1.44.14 h1:qd7/muV1rElsbvkK9D1nHUzBoDlEw2etfeo4IE82eSQ=
4+
github.com/aws/aws-sdk-go v1.44.14/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
35
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
46
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
68
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
79
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
810
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
911
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
12+
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
13+
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
14+
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
1015
github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
1116
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
1217
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -34,18 +39,25 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEt
3439
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
3540
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
3641
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
42+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
3743
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3844
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
3945
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4046
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
4147
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
48+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4250
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
51+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4352
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4453
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
4554
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
55+
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
56+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
4657
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
4758
golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
4859
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4960
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5061
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
62+
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
5163
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/bucket/bucket.go

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package bucket
2+
3+
import (
4+
"errors"
5+
"fmt"
6+
"io/ioutil"
7+
8+
"github.com/aws/aws-sdk-go/aws"
9+
"github.com/aws/aws-sdk-go/aws/credentials"
10+
"github.com/aws/aws-sdk-go/aws/session"
11+
"github.com/aws/aws-sdk-go/service/s3"
12+
"github.com/vimcolorschemes/search/internal/dotenv"
13+
)
14+
15+
func Get(bucket string, key string) (string, error) {
16+
accessKeyId, exists := dotenv.Get("AWS_S3_ACCESS_KEY_ID")
17+
if !exists {
18+
return "", errors.New("AWS_S3_ACCESS_KEY_ID is missing")
19+
}
20+
21+
secretAccessKey, exists := dotenv.Get("AWS_S3_SECRET_ACCESS_KEY")
22+
if !exists {
23+
return "", errors.New("AWS_S3_SECRET_ACCESS_KEY is missing")
24+
}
25+
26+
sess, err := session.NewSession(&aws.Config{
27+
Region: aws.String("us-east-1"),
28+
Credentials: credentials.NewStaticCredentials(accessKeyId, secretAccessKey, ""),
29+
})
30+
if err != nil {
31+
return "", err
32+
}
33+
34+
svc := s3.New(sess)
35+
36+
requestInput := &s3.GetObjectInput{
37+
Bucket: aws.String(bucket),
38+
Key: aws.String(key),
39+
}
40+
41+
result, err := svc.GetObject(requestInput)
42+
if err != nil {
43+
return "", err
44+
}
45+
defer result.Body.Close()
46+
47+
body, err := ioutil.ReadAll(result.Body)
48+
if err != nil {
49+
return "", err
50+
}
51+
52+
return fmt.Sprintf("%s", body), nil
53+
}

main.go

+26-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import (
66

77
"github.com/aws/aws-lambda-go/events"
88
"github.com/aws/aws-lambda-go/lambda"
9+
"github.com/vimcolorschemes/search/internal/bucket"
910
"github.com/vimcolorschemes/search/internal/database"
11+
"github.com/vimcolorschemes/search/internal/dotenv"
1012
"github.com/vimcolorschemes/search/internal/repository"
1113
req "github.com/vimcolorschemes/search/internal/request"
1214
)
@@ -18,6 +20,10 @@ const (
1820

1921
var Headers = map[string]string{"Access-Control-Allow-Origin": "*"}
2022

23+
type StoreRequestBody struct {
24+
Key string
25+
}
26+
2127
func handle(request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
2228
switch request.HTTPMethod {
2329
case "POST":
@@ -31,13 +37,31 @@ func handle(request events.APIGatewayProxyRequest) (events.APIGatewayProxyRespon
3137
}
3238

3339
func store(request events.APIGatewayProxyRequest) events.APIGatewayProxyResponse {
34-
var searchIndex []repository.Repository
40+
var requestBody StoreRequestBody
3541

36-
if err := json.Unmarshal([]byte(request.Body), &searchIndex); err != nil {
42+
if err := json.Unmarshal([]byte(request.Body), &requestBody); err != nil {
3743
body := req.BuildErrorBody("error trying to parse request body:", err.Error())
3844
return events.APIGatewayProxyResponse{Body: body, StatusCode: 500, Headers: Headers}
3945
}
4046

47+
bucketName, exists := dotenv.Get("AWS_S3_BUCKET")
48+
if !exists {
49+
body := req.BuildErrorBody("AWS_S3_BUCKET env variable is missing")
50+
return events.APIGatewayProxyResponse{Body: body, StatusCode: 500, Headers: Headers}
51+
}
52+
53+
fileContent, err := bucket.Get(bucketName, requestBody.Key)
54+
if err != nil {
55+
body := req.BuildErrorBody("error fetching search index file from s3:", err.Error())
56+
return events.APIGatewayProxyResponse{Body: body, StatusCode: 500, Headers: Headers}
57+
}
58+
59+
var searchIndex []repository.Repository
60+
if err := json.Unmarshal([]byte(fileContent), &searchIndex); err != nil {
61+
body := req.BuildErrorBody("error parsing search index content as JSON:", err.Error())
62+
return events.APIGatewayProxyResponse{Body: body, StatusCode: 500, Headers: Headers}
63+
}
64+
4165
if err := database.Store(searchIndex); err != nil {
4266
body := req.BuildErrorBody("error trying to store the search index:", err.Error())
4367
return events.APIGatewayProxyResponse{Body: body, StatusCode: 500, Headers: Headers}

0 commit comments

Comments
 (0)