Resolve many breaking changes

Author: aarondl

PACKAGES.md

@@ -49,9 +49,6 @@ Thank you for your continued efforts.
 * [github.com/stretchr/testify/require](https://github.com/stretchr/testify/require)
 * [github.com/unrolled/render](https://github.com/unrolled/render)
 * [github.com/volatiletech/sqlboiler](https://github.com/volatiletech/sqlboiler)
-* [github.com/volatiletech/sqlboiler/v4/bdb](https://github.com/volatiletech/sqlboiler/v4/bdb)
-* [github.com/volatiletech/sqlboiler/v4/bdb/drivers](https://github.com/volatiletech/sqlboiler/v4/bdb/drivers)
-* [github.com/volatiletech/sqlboiler/v4/strmangle](https://github.com/volatiletech/sqlboiler/v4/strmangle)
 * [github.com/volatiletech/abcweb/abcmiddleware](https://github.com/volatiletech/abcweb/abcmiddleware)
 * [github.com/volatiletech/abcweb/abcrender](https://github.com/volatiletech/abcweb/abcrender)
 * [github.com/volatiletech/abcweb/abcsessions](https://github.com/volatiletech/abcweb/abcsessions)

abcdatabase/database.go

@@ -1,19 +1,16 @@
 package abcdatabase
 
 import (
-	"bytes"
-	"database/sql"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/volatiletech/abcweb/abcconfig"
-	"github.com/volatiletech/helpers/git"
 	"github.com/volatiletech/mig"
 )
 
@@ -60,7 +57,7 @@ func RunMigrations(cfg abcconfig.DBConfig, migrationsPath string) (int, error) {
 		return 0, err
 	}
 
-	count, err := mig.Up(cfg.DB, connStr, migrationsPath)
+	count, err := mig.Up("postgres", connStr, migrationsPath)
 	if err != nil {
 		return count, err
 	}
@@ -82,7 +79,7 @@ func IsMigrated(cfg abcconfig.DBConfig) (bool, int64, error) {
 		return false, 0, err
 	}
 
-	version, err := mig.Version(cfg.DB, connStr)
+	version, err := mig.Version("postgres", connStr)
 	if err != nil {
 		return false, version, err
 	}
@@ -112,4 +109,4 @@ func isLatestVersion(dbVersion int64, files []os.FileInfo) bool {
 	}
 
 	return highestVersion == dbVersion
-}
+}

abcmiddleware/errors.go

@@ -30,15 +30,16 @@ type ErrorContainer struct {
 	Handler ErrorHandler
 }
 
-type errorManager struct {
+// ErrorManager helps manage errors at the application level
+type ErrorManager struct {
 	render abcrender.Renderer
 	errors []ErrorContainer
 }
 
 // NewErrorManager creates an error manager that can be used to
 // create an error handler to wrap your controllers with
-func NewErrorManager(render abcrender.Renderer) *errorManager {
-	return &errorManager{
+func NewErrorManager(render abcrender.Renderer) *ErrorManager {
+	return &ErrorManager{
 		render: render,
 		errors: []ErrorContainer{},
 	}
@@ -67,7 +68,7 @@ func NewError(err error, code int, template string, handler ErrorHandler) ErrorC
 }
 
 // Remove a ErrorContainer from the error manager
-func (m *errorManager) Remove(e ErrorContainer) {
+func (m *ErrorManager) Remove(e ErrorContainer) {
 	for i, v := range m.errors {
 		if reflect.DeepEqual(v, e) {
 			m.errors = append(m.errors[:i], m.errors[i+1:]...)
@@ -76,7 +77,7 @@ func (m *errorManager) Remove(e ErrorContainer) {
 }
 
 // Add a new ErrorContainer to the error manager
-func (m *errorManager) Add(e ErrorContainer) {
+func (m *ErrorManager) Add(e ErrorContainer) {
 	m.errors = append(m.errors, e)
 }
 
@@ -91,7 +92,7 @@ type ErrorHandler func(w http.ResponseWriter, r *http.Request, e ErrorContainer,
 // errors directly in your controller is that it's all centralized to one
 // location which simplifies adding notifiers (like slack and email).
 // It also reduces a lot of controller boilerplate.
-func (m *errorManager) Errors(ctrl AppHandler) http.HandlerFunc {
+func (m *ErrorManager) Errors(ctrl AppHandler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		err := ctrl(w, r)
 		if err == nil {

abcmiddleware/middleware.go

@@ -2,20 +2,11 @@ package abcmiddleware
 
 import (
 	"net/http"
-
-	"go.uber.org/zap"
 )
 
 // MiddlewareFunc is the function signature for Chi's Use() middleware
 type MiddlewareFunc func(http.Handler) http.Handler
 
-// Middleware exposes useful variables to every abcmiddleware handler
-type Middleware struct {
-	// Log is used for logging in your middleware and to
-	// create a derived logger that includes the request ID.
-	Log *zap.Logger
-}
-
 // MW is an interface defining middleware wrapping
 type MW interface {
 	Wrap(http.Handler) http.Handler

abcserver/routes.go

@@ -75,7 +75,7 @@ func NewNotFoundHandler(manifest map[string]string) *NotFound {
 func (n *NotFound) Handler(cfg abcconfig.ServerConfig, render abcrender.Renderer) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		// Get the Request ID scoped logger
-		log := abcmiddleware.Log(r)
+		log := abcmiddleware.Logger(r)
 
 		reqPath := r.URL.Path
 		// Ensure path is rooted at / to prevent path traversal
@@ -168,7 +168,7 @@ func (n *NotFound) Handler(cfg abcconfig.ServerConfig, render abcrender.Renderer
 func (m *MethodNotAllowed) Handler(render abcrender.Renderer) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		// Get the Request ID scoped logger
-		log := abcmiddleware.Log(r)
+		log := abcmiddleware.Logger(r)
 
 		log.Warn("method not allowed",
 			zap.String("method", r.Method),

cmd/config.go

@@ -19,6 +19,7 @@ type migrateConfig struct {
 
 type newConfig struct {
 	AppPath        string `toml:"app-path"`
+	TemplatePath   string `toml:"template-path"`
 	ImportPath     string `toml:"import-path"`
 	AppName        string `toml:"app-name"`
 	AppEnvName     string `toml:"app-env-name"`