From c9980fd3671d873a7197a5ac4d6ac9d6b046abb6 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Wed, 21 Aug 2019 10:46:35 -0600
Subject: Refactor Caddyfile adapter and module registration

Use piles from which to draw config values.

Module values can return their name, so now we can do two-way mapping
from value to name and name to value; whereas before we could only map
name to value. This was problematic with the Caddyfile adapter since
it receives values and needs to know the name to put in the config.
---
 modules/caddyhttp/caddyhttp.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'modules/caddyhttp/caddyhttp.go')

diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index 21c5b6d..b4b1ec6 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -37,10 +37,7 @@ import (
 func init() {
 	weakrand.Seed(time.Now().UnixNano())
 
-	err := caddy.RegisterModule(caddy.Module{
-		Name: "http",
-		New:  func() interface{} { return new(App) },
-	})
+	err := caddy.RegisterModule(App{})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -58,6 +55,14 @@ type App struct {
 	ctx caddy.Context
 }
 
+// CaddyModule returns the Caddy module information.
+func (App) CaddyModule() caddy.ModuleInfo {
+	return caddy.ModuleInfo{
+		Name: "http",
+		New:  func() caddy.Module { return new(App) },
+	}
+}
+
 // Provision sets up the app.
 func (app *App) Provision(ctx caddy.Context) error {
 	app.ctx = ctx
@@ -227,7 +232,7 @@ func (app *App) automaticHTTPS() error {
 		// find all qualifying domain names, de-duplicated
 		domainSet := make(map[string]struct{})
 		for _, route := range srv.Routes {
-			for _, matcherSet := range route.matcherSets {
+			for _, matcherSet := range route.MatcherSets {
 				for _, m := range matcherSet {
 					if hm, ok := m.(*MatchHost); ok {
 						for _, d := range *hm {
@@ -331,13 +336,13 @@ func (app *App) automaticHTTPS() error {
 				redirTo += "{http.request.uri}"
 
 				redirRoutes = append(redirRoutes, Route{
-					matcherSets: []MatcherSet{
+					MatcherSets: []MatcherSet{
 						{
 							MatchProtocol("http"),
 							MatchHost(domains),
 						},
 					},
-					handlers: []MiddlewareHandler{
+					Handlers: []MiddlewareHandler{
 						StaticResponse{
 							StatusCode: WeakString(strconv.Itoa(http.StatusTemporaryRedirect)), // TODO: use permanent redirect instead
 							Headers: http.Header{
-- 
cgit v1.2.3