mirror of
https://github.com/caddyserver/caddy.git
synced 2025-10-19 15:53:17 +00:00
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.
This commit is contained in:
parent
c4159ef76d
commit
c9980fd367
46 changed files with 1512 additions and 1105 deletions
|
@ -21,7 +21,7 @@ import (
|
|||
|
||||
func TestGetModules(t *testing.T) {
|
||||
modulesMu.Lock()
|
||||
modules = map[string]Module{
|
||||
modules = map[string]ModuleInfo{
|
||||
"a": {Name: "a"},
|
||||
"a.b": {Name: "a.b"},
|
||||
"a.b.c": {Name: "a.b.c"},
|
||||
|
@ -38,11 +38,11 @@ func TestGetModules(t *testing.T) {
|
|||
|
||||
for i, tc := range []struct {
|
||||
input string
|
||||
expect []Module
|
||||
expect []ModuleInfo
|
||||
}{
|
||||
{
|
||||
input: "",
|
||||
expect: []Module{
|
||||
expect: []ModuleInfo{
|
||||
{Name: "a"},
|
||||
{Name: "b"},
|
||||
{Name: "c"},
|
||||
|
@ -50,7 +50,7 @@ func TestGetModules(t *testing.T) {
|
|||
},
|
||||
{
|
||||
input: "a",
|
||||
expect: []Module{
|
||||
expect: []ModuleInfo{
|
||||
{Name: "a.b"},
|
||||
{Name: "a.c"},
|
||||
{Name: "a.d"},
|
||||
|
@ -58,7 +58,7 @@ func TestGetModules(t *testing.T) {
|
|||
},
|
||||
{
|
||||
input: "a.b",
|
||||
expect: []Module{
|
||||
expect: []ModuleInfo{
|
||||
{Name: "a.b.c"},
|
||||
{Name: "a.b.cd"},
|
||||
},
|
||||
|
@ -68,7 +68,7 @@ func TestGetModules(t *testing.T) {
|
|||
},
|
||||
{
|
||||
input: "b",
|
||||
expect: []Module{
|
||||
expect: []ModuleInfo{
|
||||
{Name: "b.a"},
|
||||
{Name: "b.b"},
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue