Server options moved to separate struct

Author: osminogin

CHANGELOG.md

@@ -10,3 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CSRF protection for main form.
 - Health check for Docker.
 - Heroku application manifest.
+
+### Changed
+- Server options moved to separate struct.

cmd/tornote/main.go

@@ -15,19 +15,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-//import (
-//
-//	sw "github.com/osminogin/tornote/go"
-//)
-//
-//
-//func main() {
-//
-//	router := sw.NewRouter()
-//
-//	log.Fatal(http.ListenAndServe(":8080", router))
-//}
-
 package main
 
 import (
@@ -42,6 +29,9 @@ var (
 )
 
 func main() {
+	var srv *tornote.Server
+	var opts tornote.ServerOpts
+
 	// Set default settings
 	v := viper.New()
 	v.SetDefault("PORT", 8000)
@@ -57,17 +47,12 @@ func main() {
 	v.AutomaticEnv()
 
 	// Server initialization and start
-	var srv *tornote.Server
-	var opts tornote.ServerOpts
-
+	opts.Port = v.GetUint64("PORT")
+	opts.DSN = v.GetString("DATABASE_URL")
+	opts.Secret = v.GetString("SECRET_KEY")
 	opts.HTTPSOnly = v.GetBool("HTTPS_ONLY")
 
-	srv = tornote.NewServer(
-		v.GetUint64("PORT"),
-		v.GetString("DATABASE_URL"),
-		v.GetString("SECRET_KEY"),
-		opts,
-	)
+	srv = tornote.NewServer(opts)
 	srv.Init()
 	log.Fatal(srv.Listen())
 }

server.go

@@ -32,42 +32,43 @@ import (
 )
 
 type Server struct {
-	// Listen port
-	Port uint64
-	// Data source name
-	DSN string
 	// Server options
-	Opts ServerOpts
+	opts ServerOpts
 	// PostgreSQL connection
 	db *pg.DB
-	// Server secret key
-	secret string
 	// Mux router
 	router *mux.Router
 	// Compiled templates
 	templates map[string]*template.Template
 }
 
 type ServerOpts struct {
+	// Listen port
+	Port uint64
+	// Data source name
+	DSN string
+	// HTTPS only traffic allowed
 	HTTPSOnly bool
+	// Server Secret key
+	Secret string
 }
 
 // Constructor for new Server.
-func NewServer(port uint64, dsn string, secret string, opts ServerOpts) *Server {
-	_, err := pg.ParseURL(dsn)
+func NewServer(opts ServerOpts) *Server {
+	_, err := pg.ParseURL(opts.DSN)
 	if err != nil {
 		panic(err)
 	}
-	return &Server{Port: port, DSN: dsn, secret: secret, Opts: opts}
+	return &Server{opts: opts}
 }
 
 // Open and check database connection.
 func (s *Server) connectDB() error {
-	opt, err := pg.ParseURL(s.DSN)
+	o, err := pg.ParseURL(s.opts.DSN)
 	if err != nil {
 		return err
 	}
-	s.db = pg.Connect(opt)
+	s.db = pg.Connect(o)
 
 	// XXX: Ping postgres connection
 	//if err = s.db.Ping(); err != nil {
@@ -90,7 +91,7 @@ func (s *Server) createSchema() error {
 // Generates a hash with a static length suitable for CSRF middleware.
 func (s *Server) genHashFromSecret() []byte {
 	h := sha256.New()
-	h.Write([]byte(s.secret))
+	h.Write([]byte(s.opts.Secret))
 	return h.Sum(nil)
 }
 
@@ -141,10 +142,10 @@ func (s *Server) Init() {
 	csrfMiddleware := csrf.Protect(
 		s.genHashFromSecret(),
 		csrf.FieldName("csrf_token"),
-		csrf.Secure(s.Opts.HTTPSOnly),
+		csrf.Secure(s.opts.HTTPSOnly),
 	)
 	s.router.Use(csrfMiddleware)
-	if s.Opts.HTTPSOnly {
+	if s.opts.HTTPSOnly {
 		s.router.Use(RedirectToHTTPSMiddleware)
 	}
 
@@ -175,10 +176,10 @@ func (s *Server) Listen() error {
 	}
 
 	// Start the server
-	if s.Opts.HTTPSOnly {
+	if s.opts.HTTPSOnly {
 		log.Println("HTTPS only traffic allowed")
 	}
-	log.Printf("Starting server on :%d", s.Port)
-	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", s.Port), s.router))
+	log.Printf("Starting server on :%d", s.opts.Port)
+	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", s.opts.Port), s.router))
 	return nil
 }

server_test.go

@@ -24,11 +24,20 @@ const (
 )
 
 func stubServer() *Server {
-	srv := NewServer(TestPort, TestDSN, TestSecret, ServerOpts{})
+	srv := NewServer(ServerOpts{})
 	srv.Init()
 	return srv
 }
 
+func testServerOpts() ServerOpts {
+	return ServerOpts{
+		Port:      8000,
+		DSN:       "postgres://postgres:postgres@postgres/postgres",
+		HTTPSOnly: false,
+		Secret:    "4tests0nly",
+	}
+}
+
 //func TestNewServer(t *testing.T) {
 //	s := stubServer()
 //	if s.DSN != TestDSN && s.Port != TestPort {