From 2f68483e5d69d825a6e57e9421df5871d4feb59b Mon Sep 17 00:00:00 2001 From: Alexander Karagulamos Date: Wed, 30 Mar 2022 11:33:22 +0100 Subject: [PATCH 1/5] feat: go scheduled functions template --- .../.netlify-function-template.js | 5 +++ .../go/scheduled-function/Makefile | 7 ++++ .../go/scheduled-function/go.mod | 5 +++ .../go/scheduled-function/go.sum | 21 +++++++++++ .../go/scheduled-function/netlify.toml | 12 +++++++ .../src/hourly-schedule/main.go | 36 +++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 src/functions-templates/go/scheduled-function/.netlify-function-template.js create mode 100644 src/functions-templates/go/scheduled-function/Makefile create mode 100644 src/functions-templates/go/scheduled-function/go.mod create mode 100644 src/functions-templates/go/scheduled-function/go.sum create mode 100644 src/functions-templates/go/scheduled-function/netlify.toml create mode 100644 src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go diff --git a/src/functions-templates/go/scheduled-function/.netlify-function-template.js b/src/functions-templates/go/scheduled-function/.netlify-function-template.js new file mode 100644 index 00000000000..9e35ebdd05d --- /dev/null +++ b/src/functions-templates/go/scheduled-function/.netlify-function-template.js @@ -0,0 +1,5 @@ +module.exports = { + name: 'scheduled-function', + priority: 1, + description: 'Basic implementation of a scheduled function in Go.', +} diff --git a/src/functions-templates/go/scheduled-function/Makefile b/src/functions-templates/go/scheduled-function/Makefile new file mode 100644 index 00000000000..edb33ed2c60 --- /dev/null +++ b/src/functions-templates/go/scheduled-function/Makefile @@ -0,0 +1,7 @@ +build: + mkdir -p functions + GOOS=linux + GOARCH=amd64 + GO111MODULE=on + GOBIN=${PWD}/functions go get ./... + GOBIN=${PWD}/functions go install ./... diff --git a/src/functions-templates/go/scheduled-function/go.mod b/src/functions-templates/go/scheduled-function/go.mod new file mode 100644 index 00000000000..acbf3a30f7c --- /dev/null +++ b/src/functions-templates/go/scheduled-function/go.mod @@ -0,0 +1,5 @@ +module github.com/someone/{{name}} + +go 1.17 + +require github.com/aws/aws-lambda-go v1.28.0 diff --git a/src/functions-templates/go/scheduled-function/go.sum b/src/functions-templates/go/scheduled-function/go.sum new file mode 100644 index 00000000000..4f6d65221e6 --- /dev/null +++ b/src/functions-templates/go/scheduled-function/go.sum @@ -0,0 +1,21 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnArK4= +github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/src/functions-templates/go/scheduled-function/netlify.toml b/src/functions-templates/go/scheduled-function/netlify.toml new file mode 100644 index 00000000000..b80da40b5b5 --- /dev/null +++ b/src/functions-templates/go/scheduled-function/netlify.toml @@ -0,0 +1,12 @@ +[build] +command = "make build" +functions = "functions" + +[build.environment] +GO_VERSION = "1.17.6" + +[functions] +directory = "src/" + +[functions.hourly-schedule] +schedule = "@hourly" diff --git a/src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go b/src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go new file mode 100644 index 00000000000..996930651b3 --- /dev/null +++ b/src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go @@ -0,0 +1,36 @@ +package main + +import ( + "context" + "encoding/json" + "log" + "net/http" + "time" + + "github.com/aws/aws-lambda-go/events" + "github.com/aws/aws-lambda-go/lambda" +) + +type requestBody struct { + NextRun time.Time `json:"next_run"` +} + +// The schedule for this function is defined inside the netlify.toml file. To learn about scheduled functions +// and supported cron extensions, visit https://ntl.fyi/sched-func. +func handler(ctx context.Context, request events.APIGatewayProxyRequest) (*events.APIGatewayProxyResponse, error) { + requestBody := requestBody{} + + if err := json.Unmarshal([]byte(request.Body), &requestBody); err != nil { + log.Fatalf("cannot parse request body: %s", err.Error()) + } + + log.Printf("Next run at %s\n", requestBody.NextRun.Local()) + + return &events.APIGatewayProxyResponse{ + StatusCode: http.StatusNoContent, + }, nil +} + +func main() { + lambda.Start(handler) +} From 956d80a87c15ec8c91f7515067720ae50b18e1cf Mon Sep 17 00:00:00 2001 From: karagulamos Date: Wed, 30 Mar 2022 10:40:06 +0000 Subject: [PATCH 2/5] chore: update contributors field --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 4b3eb056788..a94560be0ef 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "Cole Bosmann", "Dan Croak (https://twitter.com/croaky)", "Dan Loewenherz (https://twitter.com/dwlz)", + "Daniel Woelfel (https://twitter.com/danielwoelfel)", "Dave Ackerman ", "David Calavera (https://twitter.com/calavera)", "David Lemler (https://twitter.com/davidlemlerm)", From eb4d7cc650dbb8b6343d21e4a20d63a061f7e65d Mon Sep 17 00:00:00 2001 From: Alexander Karagulamos Date: Wed, 30 Mar 2022 12:32:58 +0100 Subject: [PATCH 3/5] chore: placeholder for github handle in go mod --- src/functions-templates/go/scheduled-function/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions-templates/go/scheduled-function/go.mod b/src/functions-templates/go/scheduled-function/go.mod index acbf3a30f7c..bf815ab97ae 100644 --- a/src/functions-templates/go/scheduled-function/go.mod +++ b/src/functions-templates/go/scheduled-function/go.mod @@ -1,4 +1,4 @@ -module github.com/someone/{{name}} +module github.com/your-github-handle/{{name}} go 1.17 From 10446ffce2f4147a697db67e2b50327a4b3a5529 Mon Sep 17 00:00:00 2001 From: Alexander Karagulamos Date: Wed, 30 Mar 2022 12:33:19 +0100 Subject: [PATCH 4/5] chore: remove unnecessary makefile --- src/functions-templates/go/scheduled-function/Makefile | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/functions-templates/go/scheduled-function/Makefile diff --git a/src/functions-templates/go/scheduled-function/Makefile b/src/functions-templates/go/scheduled-function/Makefile deleted file mode 100644 index edb33ed2c60..00000000000 --- a/src/functions-templates/go/scheduled-function/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -build: - mkdir -p functions - GOOS=linux - GOARCH=amd64 - GO111MODULE=on - GOBIN=${PWD}/functions go get ./... - GOBIN=${PWD}/functions go install ./... From c8b215c6da4730e8eda8a3c4229b652e0c78995b Mon Sep 17 00:00:00 2001 From: Alexander Karagulamos Date: Wed, 30 Mar 2022 12:34:47 +0100 Subject: [PATCH 5/5] chore: go version update --- src/functions-templates/go/scheduled-function/netlify.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/functions-templates/go/scheduled-function/netlify.toml b/src/functions-templates/go/scheduled-function/netlify.toml index b80da40b5b5..79d4132fcdb 100644 --- a/src/functions-templates/go/scheduled-function/netlify.toml +++ b/src/functions-templates/go/scheduled-function/netlify.toml @@ -1,9 +1,8 @@ [build] -command = "make build" functions = "functions" [build.environment] -GO_VERSION = "1.17.6" +GO_VERSION = "1.17" [functions] directory = "src/"