add Turbocharger support

cmd/happy-api/helpers.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/function61/gokit/crypto/cryptoutil"
+	"github.com/function61/happy-api/static"
 	"github.com/rwcarlsen/goexif/exif"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +33,7 @@ func randBetween(min, max int) int {
 }
 
 func findAttributionFromExifArtist(id string) (string, error) {
-	f, err := images.Open("images/" + id + ".jpg")
+	f, err := static.Files.Open("images/" + id + ".jpg")
 	if err != nil {
 		return "", err
 	}

cmd/happy-api/main.go

@@ -14,16 +14,15 @@ import (
 	"github.com/function61/gokit/log/logex"
 	"github.com/function61/gokit/net/http/httputils"
 	"github.com/function61/gokit/os/osutil"
+	"github.com/function61/edgerouter/pkg/turbocharger/turbochargerapp"
+	"github.com/function61/happy-api/static"
 	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
 )
 
 //go:embed item.html
 var templates embed.FS
 
-//go:embed images/*
-var images embed.FS
-
 func main() {
 	rand.Seed(time.Now().UnixNano())
 
@@ -54,6 +53,7 @@ func main() {
 	}
 
 	app.AddCommand(newEntry())
+	app.AddCommand(turbochargerapp.StaticFilesExportEntrypoint(static.Files))
 
 	osutil.ExitIfError(app.Execute())
 }
@@ -64,7 +64,7 @@ func httpHandler() http.Handler {
 		panic(err)
 	}
 
-	happiness, err := images.ReadDir("images")
+	happiness, err := static.Files.ReadDir("images")
 	if err != nil {
 		panic(err)
 	}
@@ -77,7 +77,7 @@ func httpHandler() http.Handler {
 		http.Redirect(w, r, "/happy/"+fileIdFromFilename(happiness[idx].Name()), http.StatusFound)
 	}
 
-	routes.PathPrefix("/happy/images/").Handler(http.StripPrefix("/happy/", http.FileServer(http.FS(images))))
+	routes.PathPrefix("/happy/static").Handler(turbochargerapp.FileHandler("/happy/static", static.Files))
 
 	routes.HandleFunc("/happy", redirectToRandomItem)
 	routes.HandleFunc("/happy/", redirectToRandomItem)
@@ -101,7 +101,7 @@ func httpHandler() http.Handler {
 			ImgSrc      string
 			Attribution string
 		}{
-			ImgSrc:      "/happy/images/" + id + ".jpg",
+			ImgSrc:      "/happy/static/images/" + id + ".jpg",
 			Attribution: attribution,
 		})
 	})

go.mod

@@ -3,7 +3,8 @@ module github.com/function61/happy-api
 go 1.16
 
 require (
-	github.com/aws/aws-lambda-go v1.13.2
+	github.com/aws/aws-lambda-go v1.14.0
+	github.com/function61/edgerouter v0.0.0-20210729173323-2093d095c684 // indirect
 	github.com/function61/gokit v0.0.0-20210207144405-1f1e50ad6dcc
 	github.com/gorilla/mux v1.7.4
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd

static/embed.go

@@ -0,0 +1,8 @@
+package static
+
+import (
+	"embed"
+)
+
+//go:embed images/*
+var Files embed.FS