Simplify router construction

bryphe-coder · bryphe-coder · commit a41039653719 · 2022-02-05T02:32:22.000Z
diff --git a/nextrouter/nextrouter.go b/nextrouter/nextrouter.go
@@ -13,10 +13,10 @@ import (
 )
 
 // Handler returns an HTTP handler for serving a next-based static site
-func Handler(fileSystem fs.FS) (http.Handler, error) {
+func Handler(fileSystem fs.FS) http.Handler {
 	rtr := chi.NewRouter()
 	buildRouter(rtr, fileSystem, "")
-	return rtr, nil
+	return rtr
 }
 
 func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
diff --git a/nextrouter/nextrouter_test.go b/nextrouter/nextrouter_test.go
@@ -34,8 +34,7 @@ func TestNextRouter(t *testing.T) {
 		err := rootFS.WriteFile("test.html", []byte("test123"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/test.html")
@@ -54,8 +53,7 @@ func TestNextRouter(t *testing.T) {
 		err := rootFS.WriteFile("test.html", []byte("test-no-extension"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/test")
@@ -74,8 +72,7 @@ func TestNextRouter(t *testing.T) {
 		err := rootFS.WriteFile("index.html", []byte("test-root-index"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/")
@@ -98,8 +95,7 @@ func TestNextRouter(t *testing.T) {
 		rootFS.WriteFile("test/a/b/c.html", []byte("test123"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/test/a/b/c.html")
@@ -126,8 +122,8 @@ func TestNextRouter(t *testing.T) {
 		rootFS.WriteFile("test/a/b/c/index.html", []byte("test-abc-index"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
+
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/test/a/b/c")
@@ -147,8 +143,7 @@ func TestNextRouter(t *testing.T) {
 		err := rootFS.WriteFile("test.html", []byte("test123"), 0755)
 		require.NoError(t, err)
 
-		router, err := nextrouter.Handler(rootFS)
-		require.NoError(t, err)
+		router := nextrouter.Handler(rootFS)
 		server := httptest.NewServer(router)
 
 		res, err := request(server, "/test-non-existent.html")

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// Handler returns an HTTP handler for serving a next-based static site`
`16`		`-func Handler(fileSystem fs.FS) (http.Handler, error) {`
	`16`	`+func Handler(fileSystem fs.FS) http.Handler {`
`17`	`17`	`rtr := chi.NewRouter()`
`18`	`18`	`buildRouter(rtr, fileSystem, "")`
`19`		`- return rtr, nil`
	`19`	`+ return rtr`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {`