\n", rec.Body.String())
+ }
}
func TestEchoIndex(t *testing.T) {
e := New()
- e.Index("recipes/website/public/index.html")
+ e.Index("_fixture/index.html")
c, b := request(GET, "/", e)
assert.Equal(t, http.StatusOK, c)
assert.NotEmpty(t, b)
@@ -51,7 +69,7 @@ func TestEchoIndex(t *testing.T) {
func TestEchoFavicon(t *testing.T) {
e := New()
- e.Favicon("recipes/website/public/favicon.ico")
+ e.Favicon("_fixture/favicon.ico")
c, b := request(GET, "/favicon.ico", e)
assert.Equal(t, http.StatusOK, c)
assert.NotEmpty(t, b)
@@ -61,23 +79,23 @@ func TestEchoStatic(t *testing.T) {
e := New()
// OK
- e.Static("/scripts", "recipes/website/public/scripts")
- c, b := request(GET, "/scripts/main.js", e)
+ e.Static("/images", "_fixture/images")
+ c, b := request(GET, "/images/walle.png", e)
assert.Equal(t, http.StatusOK, c)
assert.NotEmpty(t, b)
// No file
- e.Static("/scripts", "recipes/website/public/scripts")
- c, _ = request(GET, "/scripts/index.js", e)
+ e.Static("/images", "_fixture/scripts")
+ c, _ = request(GET, "/images/bolt.png", e)
assert.Equal(t, http.StatusNotFound, c)
// Directory
- e.Static("/scripts", "recipes/website/public/scripts")
- c, _ = request(GET, "/scripts", e)
+ e.Static("/images", "_fixture/images")
+ c, _ = request(GET, "/images", e)
assert.Equal(t, http.StatusForbidden, c)
// Directory with index.html
- e.Static("/", "recipes/website/public")
+ e.Static("/", "_fixture")
c, r := request(GET, "/", e)
assert.Equal(t, http.StatusOK, c)
assert.Equal(t, true, strings.HasPrefix(r, ""))
@@ -85,7 +103,8 @@ func TestEchoStatic(t *testing.T) {
// Sub-directory with index.html
c, r = request(GET, "/folder", e)
assert.Equal(t, http.StatusOK, c)
- assert.Equal(t, "sub directory", r)
+ assert.Equal(t, true, strings.HasPrefix(r, ""))
+ // assert.Equal(t, "sub directory", r)
}
func TestEchoMiddleware(t *testing.T) {
@@ -273,7 +292,7 @@ func TestEchoWebSocket(t *testing.T) {
url := fmt.Sprintf("ws://%s/ws", addr)
ws, err := websocket.Dial(url, "", origin)
if assert.NoError(t, err) {
- ws.Write([]byte("test"))
+ ws.Write([]byte("test\n"))
defer ws.Close()
buf := new(bytes.Buffer)
buf.ReadFrom(ws)
@@ -398,6 +417,8 @@ func TestEchoHTTPError(t *testing.T) {
he := NewHTTPError(http.StatusBadRequest, m)
assert.Equal(t, http.StatusBadRequest, he.Code())
assert.Equal(t, m, he.Error())
+ he.SetCode(http.StatusOK)
+ assert.Equal(t, http.StatusOK, he.Code())
}
func TestEchoServer(t *testing.T) {
@@ -424,6 +445,31 @@ func TestEchoHook(t *testing.T) {
assert.Equal(t, r.URL.Path, "/test")
}
+func TestEchoUse(t *testing.T) {
+ e := New()
+ buf := new(bytes.Buffer)
+ mw1 := MiddlewareFunc(func(h HandlerFunc) HandlerFunc {
+ return func(c *Context) error {
+ buf.WriteString("mw1")
+ return h(c)
+ }
+ })
+ mw2 := MiddlewareFunc(func(h HandlerFunc) HandlerFunc {
+ return func(c *Context) error {
+ buf.WriteString("mw2")
+ return h(c)
+ }
+ })
+ e.Get("/", Use(func(c *Context) error {
+ return c.String(http.StatusOK, "Okay")
+ }, mw1, mw2))
+
+ r, _ := http.NewRequest(GET, "/", nil)
+ w := httptest.NewRecorder()
+ e.ServeHTTP(w, r)
+ assert.Equal(t, "mw1mw2", buf.String())
+}
+
func testMethod(t *testing.T, method, path string, e *Echo) {
m := fmt.Sprintf("%c%s", method[0], strings.ToLower(method[1:]))
p := reflect.ValueOf(path)
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 000000000..f731e12e3
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,30 @@
+hash: e300b5e8680ee0ce02a89f7b931687fb248b57516e959cbb9a889c824957e727
+updated: 2016-06-09T13:25:18.242243375-07:00
+imports:
+- name: github.com/labstack/gommon
+ version: 722aa12d41c236ce78ff48eac1cafe0107ecdc9d
+ subpackages:
+ - color
+ - log
+- name: github.com/mattn/go-colorable
+ version: 9056b7a9f2d1f2d96498d6d146acd1f9d5ed3d59
+- name: github.com/mattn/go-isatty
+ version: 56b76bdf51f7708750eac80fa38b952bb9f32639
+- name: github.com/stretchr/testify
+ version: 8d64eb7173c7753d6419fd4a9caf057398611364
+ subpackages:
+ - assert
+- name: github.com/valyala/fasttemplate
+ version: 3b874956e03f1636d171bda64b130f9135f42cff
+- name: golang.org/x/net
+ version: 3f122ce3dbbe488b7e6a8bdb26f41edec852a40b
+ subpackages:
+ - context
+ - websocket
+- name: golang.org/x/sys
+ version: 076b546753157f758b316e59bcb51e6807c04057
+ subpackages:
+ - unix
+- name: gopkg.in/labstack/echo.v1
+ version: be5efe5927206c132948c096ad3da6357d922b56
+devImports: []
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 000000000..3a0590134
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,14 @@
+package: github.com/labstack/echo
+import:
+- package: github.com/labstack/gommon
+ subpackages:
+ - color
+ - log
+- package: golang.org/x/net
+ subpackages:
+ - context
+ - websocket
+- package: gopkg.in/labstack/echo.v1
+- package: github.com/stretchr/testify
+ subpackages:
+ - assert
diff --git a/group.go b/group.go
index 856a33651..d6190bd20 100644
--- a/group.go
+++ b/group.go
@@ -1,69 +1,104 @@
package echo
-type (
- Group struct {
- echo Echo
- }
-)
+// Group is a set of subroutes for a specified route. It can be used for inner
+// routes that share a common middlware or functionality that should be separate
+// from the parent echo instance while still inheriting from it.
+type Group struct {
+ echo Echo
+}
+// Use implements the echo.Use interface for subroutes within the Group.
func (g *Group) Use(m ...Middleware) {
for _, h := range m {
g.echo.middleware = append(g.echo.middleware, wrapMiddleware(h))
}
+
+ g.echo.Any(g.echo.prefix+"*", notFoundHandler)
}
+// Connect implements the echo.Connect interface for subroutes within the Group.
func (g *Group) Connect(path string, h Handler) {
g.echo.Connect(path, h)
}
+// Delete implements the echo.Delete interface for subroutes within the Group.
func (g *Group) Delete(path string, h Handler) {
g.echo.Delete(path, h)
}
+// Get implements the echo.Get interface for subroutes within the Group.
func (g *Group) Get(path string, h Handler) {
g.echo.Get(path, h)
}
+// Head implements the echo.Head interface for subroutes within the Group.
func (g *Group) Head(path string, h Handler) {
g.echo.Head(path, h)
}
+// Options implements the echo.Options interface for subroutes within the Group.
func (g *Group) Options(path string, h Handler) {
g.echo.Options(path, h)
}
+// Patch implements the echo.Patch interface for subroutes within the Group.
func (g *Group) Patch(path string, h Handler) {
g.echo.Patch(path, h)
}
+// Post implements the echo.Post interface for subroutes within the Group.
func (g *Group) Post(path string, h Handler) {
g.echo.Post(path, h)
}
+// Put implements the echo.Put interface for subroutes within the Group.
func (g *Group) Put(path string, h Handler) {
g.echo.Put(path, h)
}
+// Trace implements the echo.Trace interface for subroutes within the Group.
func (g *Group) Trace(path string, h Handler) {
g.echo.Trace(path, h)
}
+// Any implements the echo.Any interface for subroutes within the Group.
+func (g *Group) Any(path string, h Handler) {
+ for _, m := range methods {
+ g.echo.add(m, path, h)
+ }
+}
+
+// Match implements the echo.Match interface for subroutes within the Group.
+func (g *Group) Match(methods []string, path string, h Handler) {
+ for _, m := range methods {
+ g.echo.add(m, path, h)
+ }
+}
+
+// WebSocket implements the echo.WebSocket interface for subroutes within the
+// Group.
func (g *Group) WebSocket(path string, h HandlerFunc) {
g.echo.WebSocket(path, h)
}
+// Static implements the echo.Static interface for subroutes within the Group.
func (g *Group) Static(path, root string) {
g.echo.Static(path, root)
}
+// ServeDir implements the echo.ServeDir interface for subroutes within the
+// Group.
func (g *Group) ServeDir(path, root string) {
g.echo.ServeDir(path, root)
}
+// ServeFile implements the echo.ServeFile interface for subroutes within the
+// Group.
func (g *Group) ServeFile(path, file string) {
g.echo.ServeFile(path, file)
}
+// Group implements the echo.Group interface for subroutes within the Group.
func (g *Group) Group(prefix string, m ...Middleware) *Group {
return g.echo.Group(prefix, m...)
}
diff --git a/group_test.go b/group_test.go
index f605993cc..d4eebb3fa 100644
--- a/group_test.go
+++ b/group_test.go
@@ -14,6 +14,8 @@ func TestGroup(t *testing.T) {
g.Post("/", h)
g.Put("/", h)
g.Trace("/", h)
+ g.Any("/", h)
+ g.Match([]string{GET, POST}, "/", h)
g.WebSocket("/ws", h)
g.Static("/scripts", "scripts")
g.ServeDir("/scripts", "scripts")
diff --git a/middleware/auth.go b/middleware/auth.go
index 23c494c57..c1488178a 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -4,21 +4,23 @@ import (
"encoding/base64"
"net/http"
- "github.com/labstack/echo"
+ echo "gopkg.in/labstack/echo.v1"
)
type (
+ // BasicValidateFunc is the expected format a BasicAuth fn argument is
+ // expected to implement.
BasicValidateFunc func(string, string) bool
)
const (
+ // Basic is the authentication scheme implemented by the middleware.
Basic = "Basic"
)
-// BasicAuth returns an HTTP basic authentication middleware.
-//
-// For valid credentials it calls the next handler.
-// For invalid credentials, it sends "401 - Unauthorized" response.
+// BasicAuth returns a HTTP basic authentication middleware.
+// For valid credentials, it calls the next handler.
+// For invalid credentials, it returns a "401 Unauthorized" HTTP error.
func BasicAuth(fn BasicValidateFunc) echo.HandlerFunc {
return func(c *echo.Context) error {
// Skip WebSocket
diff --git a/middleware/auth_test.go b/middleware/auth_test.go
index d8b80c978..42e3c9d10 100644
--- a/middleware/auth_test.go
+++ b/middleware/auth_test.go
@@ -6,8 +6,8 @@ import (
"net/http/httptest"
"testing"
- "github.com/labstack/echo"
"github.com/stretchr/testify/assert"
+ echo "gopkg.in/labstack/echo.v1"
)
func TestBasicAuth(t *testing.T) {
diff --git a/middleware/compress.go b/middleware/compress.go
index 8c0095556..302229644 100644
--- a/middleware/compress.go
+++ b/middleware/compress.go
@@ -10,7 +10,7 @@ import (
"strings"
"sync"
- "github.com/labstack/echo"
+ echo "gopkg.in/labstack/echo.v1"
)
type (
diff --git a/middleware/compress_test.go b/middleware/compress_test.go
index dc8b2a46e..af468612b 100644
--- a/middleware/compress_test.go
+++ b/middleware/compress_test.go
@@ -8,8 +8,8 @@ import (
"testing"
"time"
- "github.com/labstack/echo"
"github.com/stretchr/testify/assert"
+ echo "gopkg.in/labstack/echo.v1"
)
type closeNotifyingRecorder struct {
diff --git a/middleware/logger.go b/middleware/logger.go
index 9b88980cf..37193793c 100644
--- a/middleware/logger.go
+++ b/middleware/logger.go
@@ -4,10 +4,15 @@ import (
"net"
"time"
- "github.com/labstack/echo"
"github.com/labstack/gommon/color"
+ echo "gopkg.in/labstack/echo.v1"
)
+const (
+ format = "%s %s %s %s %s %d"
+)
+
+// Logger returns a Middleware that logs requests.
func Logger() echo.MiddlewareFunc {
return func(h echo.HandlerFunc) echo.HandlerFunc {
return func(c *echo.Context) error {
@@ -47,7 +52,7 @@ func Logger() echo.MiddlewareFunc {
code = color.Cyan(n)
}
- logger.Info("%s %s %s %s %s %d", remoteAddr, method, path, code, stop.Sub(start), size)
+ logger.Printf(format, remoteAddr, method, path, code, stop.Sub(start), size)
return nil
}
}
diff --git a/middleware/logger_test.go b/middleware/logger_test.go
index 298154b4e..51dc85723 100644
--- a/middleware/logger_test.go
+++ b/middleware/logger_test.go
@@ -7,8 +7,8 @@ import (
"net/http/httptest"
"testing"
- "github.com/labstack/echo"
"github.com/stretchr/testify/assert"
+ echo "gopkg.in/labstack/echo.v1"
)
func TestLogger(t *testing.T) {
diff --git a/middleware/recover.go b/middleware/recover.go
index 9bc266ce2..c6e18765d 100644
--- a/middleware/recover.go
+++ b/middleware/recover.go
@@ -5,7 +5,7 @@ import (
"runtime"
- "github.com/labstack/echo"
+ echo "gopkg.in/labstack/echo.v1"
)
// Recover returns a middleware which recovers from panics anywhere in the chain
diff --git a/middleware/recover_test.go b/middleware/recover_test.go
index 3adedebbc..4f0de8fcd 100644
--- a/middleware/recover_test.go
+++ b/middleware/recover_test.go
@@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"
- "github.com/labstack/echo"
"github.com/stretchr/testify/assert"
+ echo "gopkg.in/labstack/echo.v1"
)
func TestRecover(t *testing.T) {
diff --git a/recipes/crud/server.go b/recipes/crud/server.go
deleted file mode 100644
index 683acb8bb..000000000
--- a/recipes/crud/server.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package main
-
-import (
- "net/http"
- "strconv"
-
- "github.com/labstack/echo"
- mw "github.com/labstack/echo/middleware"
-)
-
-type (
- user struct {
- ID int
- Name string
- }
-)
-
-var (
- users = map[int]*user{}
- seq = 1
-)
-
-//----------
-// Handlers
-//----------
-
-func createUser(c *echo.Context) error {
- u := &user{
- ID: seq,
- }
- if err := c.Bind(u); err != nil {
- return err
- }
- users[u.ID] = u
- seq++
- return c.JSON(http.StatusCreated, u)
-}
-
-func getUser(c *echo.Context) error {
- id, _ := strconv.Atoi(c.Param("id"))
- return c.JSON(http.StatusOK, users[id])
-}
-
-func updateUser(c *echo.Context) error {
- u := new(user)
- if err := c.Bind(u); err != nil {
- return err
- }
- id, _ := strconv.Atoi(c.Param("id"))
- users[id].Name = u.Name
- return c.JSON(http.StatusOK, users[id])
-}
-
-func deleteUser(c *echo.Context) error {
- id, _ := strconv.Atoi(c.Param("id"))
- delete(users, id)
- return c.NoContent(http.StatusNoContent)
-}
-
-func main() {
- e := echo.New()
-
- // Middleware
- e.Use(mw.Logger())
- e.Use(mw.Recover())
-
- // Routes
- e.Post("/users", createUser)
- e.Get("/users/:id", getUser)
- e.Patch("/users/:id", updateUser)
- e.Delete("/users/:id", deleteUser)
-
- // Start server
- e.Run(":1323")
-}
diff --git a/recipes/embed-resources/.gitignore b/recipes/embed-resources/.gitignore
deleted file mode 100644
index 9524d94fa..000000000
--- a/recipes/embed-resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-rice
-app.rice-box.go
diff --git a/recipes/embed-resources/app/index.html b/recipes/embed-resources/app/index.html
deleted file mode 100644
index 66aac4465..000000000
--- a/recipes/embed-resources/app/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- go.rice Example
-
-
-
-
go.rice Example
-
-
diff --git a/recipes/embed-resources/app/main.js b/recipes/embed-resources/app/main.js
deleted file mode 100644
index f888dc5ca..000000000
--- a/recipes/embed-resources/app/main.js
+++ /dev/null
@@ -1 +0,0 @@
-alert("main.js");
diff --git a/recipes/embed-resources/rice.go b/recipes/embed-resources/rice.go
deleted file mode 100644
index 7dcc4b8ea..000000000
--- a/recipes/embed-resources/rice.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package main
-
-import (
- "net/http"
-
- "github.com/GeertJohan/go.rice"
- "github.com/labstack/echo"
-)
-
-func main() {
- e := echo.New()
- // the file server for rice. "app" is the folder where the files come from.
- assetHandler := http.FileServer(rice.MustFindBox("app").HTTPBox())
- // serves the index.html from rice
- e.Get("/", func(c *echo.Context) error {
- assetHandler.ServeHTTP(c.Response().Writer(), c.Request())
- return nil
- })
- // servers other static files
- e.Get("/static/*", func(c *echo.Context) error {
- http.StripPrefix("/static/", assetHandler).
- ServeHTTP(c.Response().Writer(), c.Request())
- return nil
- })
- e.Run(":3000")
-}
diff --git a/recipes/file-upload/public/index.html b/recipes/file-upload/public/index.html
deleted file mode 100644
index cdbdb3e50..000000000
--- a/recipes/file-upload/public/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- File Upload
-
-
-
Upload Files
-
-
-
-
diff --git a/recipes/file-upload/server.go b/recipes/file-upload/server.go
deleted file mode 100644
index 05ba9e996..000000000
--- a/recipes/file-upload/server.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package main
-
-import (
- "fmt"
- "io"
- "os"
-
- "net/http"
-
- "github.com/labstack/echo"
- mw "github.com/labstack/echo/middleware"
-)
-
-func upload(c *echo.Context) error {
- req := c.Request()
- req.ParseMultipartForm(16 << 20) // Max memory 16 MiB
-
- // Read form fields
- name := c.Form("name")
- email := c.Form("email")
-
- // Read files
- files := req.MultipartForm.File["files"]
- for _, f := range files {
- // Source file
- src, err := f.Open()
- if err != nil {
- return err
- }
- defer src.Close()
-
- // Destination file
- dst, err := os.Create(f.Filename)
- if err != nil {
- return err
- }
- defer dst.Close()
-
- if _, err = io.Copy(dst, src); err != nil {
- return err
- }
- }
- return c.String(http.StatusOK, fmt.Sprintf("Thank You! %s <%s>, %d files uploaded successfully.",
- name, email, len(files)))
-}
-
-func main() {
- e := echo.New()
- e.Use(mw.Logger())
- e.Use(mw.Recover())
-
- e.Static("/", "public")
- e.Post("/upload", upload)
-
- e.Run(":1323")
-}
diff --git a/recipes/google-app-engine/Dockerfile b/recipes/google-app-engine/Dockerfile
deleted file mode 100644
index 5d1c13e53..000000000
--- a/recipes/google-app-engine/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dockerfile extending the generic Go image with application files for a
-# single application.
-FROM gcr.io/google_appengine/golang
-
-COPY . /go/src/app
-RUN go-wrapper download
-RUN go-wrapper install -tags appenginevm
\ No newline at end of file
diff --git a/recipes/google-app-engine/app-engine.go b/recipes/google-app-engine/app-engine.go
deleted file mode 100644
index ddbf39445..000000000
--- a/recipes/google-app-engine/app-engine.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build appengine
-
-package main
-
-import (
- "github.com/labstack/echo"
- "net/http"
-)
-
-func createMux() *echo.Echo {
- e := echo.New()
-
- // note: we don't need to provide the middleware or static handlers, that's taken care of by the platform
- // app engine has it's own "main" wrapper - we just need to hook echo into the default handler
- http.Handle("/", e)
-
- return e
-}
diff --git a/recipes/google-app-engine/app-engine.yaml b/recipes/google-app-engine/app-engine.yaml
deleted file mode 100644
index e8f5bf050..000000000
--- a/recipes/google-app-engine/app-engine.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-application: my-application-id # defined when you create your app using google dev console
-module: default # see https://cloud.google.com/appengine/docs/go/
-version: alpha # you can run multiple versions of an app and A/B test
-runtime: go # see https://cloud.google.com/appengine/docs/go/
-api_version: go1 # used when appengine supports different go versions
-
-default_expiration: "1d" # for CDN serving of static files (use url versioning if long!)
-
-handlers:
-# all the static files that we normally serve ourselves are defined here and Google will handle
-# serving them for us from it's own CDN / edge locations. For all the configuration options see:
-# https://cloud.google.com/appengine/docs/go/config/appconfig#Go_app_yaml_Static_file_handlers
-- url: /
- mime_type: text/html
- static_files: public/index.html
- upload: public/index.html
-
-- url: /favicon.ico
- mime_type: image/x-icon
- static_files: public/favicon.ico
- upload: public/favicon.ico
-
-- url: /scripts
- mime_type: text/javascript
- static_dir: public/scripts
-
-# static files normally don't touch the server that the app runs on but server-side template files
-# needs to be readable by the app. The application_readable option makes sure they are available as
-# part of the app deployment onto the instance.
-- url: /templates
- static_dir: /templates
- application_readable: true
-
-# finally, we route all other requests to our application. The script name just means "the go app"
-- url: /.*
- script: _go_app
\ No newline at end of file
diff --git a/recipes/google-app-engine/app-managed.go b/recipes/google-app-engine/app-managed.go
deleted file mode 100644
index cc5adfbf8..000000000
--- a/recipes/google-app-engine/app-managed.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build appenginevm
-
-package main
-
-import (
- "github.com/labstack/echo"
- "google.golang.org/appengine"
- "net/http"
- "runtime"
-)
-
-func createMux() *echo.Echo {
- // we're in a container on a Google Compute Engine instance so are not sandboxed anymore ...
- runtime.GOMAXPROCS(runtime.NumCPU())
-
- e := echo.New()
-
- // note: we don't need to provide the middleware or static handlers
- // for the appengine vm version - that's taken care of by the platform
-
- return e
-}
-
-func main() {
- // the appengine package provides a convenient method to handle the health-check requests
- // and also run the app on the correct port. We just need to add Echo to the default handler
- http.Handle("/", e)
- appengine.Main()
-}
diff --git a/recipes/google-app-engine/app-managed.yaml b/recipes/google-app-engine/app-managed.yaml
deleted file mode 100644
index d5da4cd94..000000000
--- a/recipes/google-app-engine/app-managed.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-application: my-application-id # defined when you create your app using google dev console
-module: default # see https://cloud.google.com/appengine/docs/go/
-version: alpha # you can run multiple versions of an app and A/B test
-runtime: go # see https://cloud.google.com/appengine/docs/go/
-api_version: go1 # used when appengine supports different go versions
-vm: true # for managed VMs only, remove for appengine classic
-
-default_expiration: "1d" # for CDN serving of static files (use url versioning if long!)
-
-handlers:
-# all the static files that we normally serve ourselves are defined here and Google will handle
-# serving them for us from it's own CDN / edge locations. For all the configuration options see:
-# https://cloud.google.com/appengine/docs/go/config/appconfig#Go_app_yaml_Static_file_handlers
-- url: /
- mime_type: text/html
- static_files: public/index.html
- upload: public/index.html
-
-- url: /favicon.ico
- mime_type: image/x-icon
- static_files: public/favicon.ico
- upload: public/favicon.ico
-
-- url: /scripts
- mime_type: text/javascript
- static_dir: public/scripts
-
-# static files normally don't touch the server that the app runs on but server-side template files
-# needs to be readable by the app. The application_readable option makes sure they are available as
-# part of the app deployment onto the instance.
-- url: /templates
- static_dir: /templates
- application_readable: true
-
-# finally, we route all other requests to our application. The script name just means "the go app"
-- url: /.*
- script: _go_app
\ No newline at end of file
diff --git a/recipes/google-app-engine/app-standalone.go b/recipes/google-app-engine/app-standalone.go
deleted file mode 100644
index 0a6881fa8..000000000
--- a/recipes/google-app-engine/app-standalone.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build !appengine,!appenginevm
-
-package main
-
-import (
- "github.com/labstack/echo"
- "github.com/labstack/echo/middleware"
-)
-
-func createMux() *echo.Echo {
- e := echo.New()
-
- e.Use(middleware.Recover())
- e.Use(middleware.Logger())
- e.Use(middleware.Gzip())
-
- e.Index("public/index.html")
- e.Static("/public", "public")
-
- return e
-}
-
-func main() {
- e.Run(":8080")
-}
diff --git a/recipes/google-app-engine/app.go b/recipes/google-app-engine/app.go
deleted file mode 100644
index 442ed8863..000000000
--- a/recipes/google-app-engine/app.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package main
-
-// referecnce our echo instance and create it early
-var e = createMux()
diff --git a/recipes/google-app-engine/public/index.html b/recipes/google-app-engine/public/index.html
deleted file mode 100644
index aed4f4668..000000000
--- a/recipes/google-app-engine/public/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Echo
-
-
-
-
-
-
Echo!
-
-
-
diff --git a/recipes/google-app-engine/public/scripts/main.js b/recipes/google-app-engine/public/scripts/main.js
deleted file mode 100644
index 62a4c8f1f..000000000
--- a/recipes/google-app-engine/public/scripts/main.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log("Echo!");
diff --git a/recipes/google-app-engine/templates/welcome.html b/recipes/google-app-engine/templates/welcome.html
deleted file mode 100644
index 5dc667c36..000000000
--- a/recipes/google-app-engine/templates/welcome.html
+++ /dev/null
@@ -1 +0,0 @@
-{{define "welcome"}}Hello, {{.}}!{{end}}
diff --git a/recipes/google-app-engine/users.go b/recipes/google-app-engine/users.go
deleted file mode 100644
index 8b1bf019d..000000000
--- a/recipes/google-app-engine/users.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package main
-
-import (
- "net/http"
-
- "github.com/labstack/echo"
- "github.com/rs/cors"
-)
-
-type (
- user struct {
- ID string `json:"id"`
- Name string `json:"name"`
- }
-)
-
-var (
- users map[string]user
-)
-
-func init() {
- users = map[string]user{
- "1": user{
- ID: "1",
- Name: "Wreck-It Ralph",
- },
- }
-
- // hook into the echo instance to create an endpoint group
- // and add specific middleware to it plus handlers
- g := e.Group("/users")
- g.Use(cors.Default().Handler)
-
- g.Post("", createUser)
- g.Get("", getUsers)
- g.Get("/:id", getUser)
-}
-
-func createUser(c *echo.Context) error {
- u := new(user)
- if err := c.Bind(u); err != nil {
- return err
- }
- users[u.ID] = *u
- return c.JSON(http.StatusCreated, u)
-}
-
-func getUsers(c *echo.Context) error {
- return c.JSON(http.StatusOK, users)
-}
-
-func getUser(c *echo.Context) error {
- return c.JSON(http.StatusOK, users[c.P(0)])
-}
diff --git a/recipes/google-app-engine/welcome.go b/recipes/google-app-engine/welcome.go
deleted file mode 100644
index 2599a4d93..000000000
--- a/recipes/google-app-engine/welcome.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package main
-
-import (
- "html/template"
- "io"
- "net/http"
-
- "github.com/labstack/echo"
-)
-
-type (
- Template struct {
- templates *template.Template
- }
-)
-
-func init() {
- t := &Template{
- templates: template.Must(template.ParseFiles("templates/welcome.html")),
- }
- e.SetRenderer(t)
- e.Get("/welcome", welcome)
-}
-
-func (t *Template) Render(w io.Writer, name string, data interface{}) error {
- return t.templates.ExecuteTemplate(w, name, data)
-}
-
-func welcome(c *echo.Context) error {
- return c.Render(http.StatusOK, "welcome", "Joe")
-}
diff --git a/recipes/graceful-shutdown/grace/server.go b/recipes/graceful-shutdown/grace/server.go
deleted file mode 100644
index 3a19c9b1a..000000000
--- a/recipes/graceful-shutdown/grace/server.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-import (
- "net/http"
-
- "github.com/facebookgo/grace/gracehttp"
- "github.com/labstack/echo"
-)
-
-func main() {
- // Setup
- e := echo.New()
- e.Get("/", func(c *echo.Context) error {
- return c.String(http.StatusOK, "Six sick bricks tick")
- })
-
- // Get the http.Server
- s := e.Server(":1323")
-
- // HTTP2 is currently enabled by default in echo.New(). To override TLS handshake errors
- // you will need to override the TLSConfig for the server so it does not attempt to validate
- // the connection using TLS as required by HTTP2
- s.TLSConfig = nil
-
- // Serve it like a boss
- gracehttp.Serve(s)
-}
diff --git a/recipes/graceful-shutdown/graceful/server.go b/recipes/graceful-shutdown/graceful/server.go
deleted file mode 100644
index 5f6b46a86..000000000
--- a/recipes/graceful-shutdown/graceful/server.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package main
-
-import (
- "net/http"
- "time"
-
- "github.com/labstack/echo"
- "github.com/tylerb/graceful"
-)
-
-func main() {
- // Setup
- e := echo.New()
- e.Get("/", func(c *echo.Context) error {
- return c.String(http.StatusOK, "Sue sews rose on slow joe crows nose")
- })
-
- graceful.ListenAndServe(e.Server(":1323"), 5*time.Second)
-}
diff --git a/recipes/hello-world/server.go b/recipes/hello-world/server.go
deleted file mode 100644
index 88883d074..000000000
--- a/recipes/hello-world/server.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package main
-
-import (
- "net/http"
-
- "github.com/labstack/echo"
- mw "github.com/labstack/echo/middleware"
-)
-
-// Handler
-func hello(c *echo.Context) error {
- return c.String(http.StatusOK, "Hello, World!\n")
-}
-
-func main() {
- // Echo instance
- e := echo.New()
-
- // Middleware
- e.Use(mw.Logger())
- e.Use(mw.Recover())
-
- // Routes
- e.Get("/", hello)
-
- // Start server
- e.Run(":1323")
-}
diff --git a/recipes/jsonp/public/index.html b/recipes/jsonp/public/index.html
deleted file mode 100644
index 033632e91..000000000
--- a/recipes/jsonp/public/index.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
- JSONP
-
-
-
-
-
-
-
![walle.png](\"walle.png\"){kind=link}