summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/caddyfile/adapter.go15
-rw-r--r--caddyconfig/configadapters.go6
-rw-r--r--caddyconfig/httpcaddyfile/builtins_test.go11
-rw-r--r--caddyconfig/httpcaddyfile/httptype_test.go30
4 files changed, 14 insertions, 48 deletions
diff --git a/caddyconfig/caddyfile/adapter.go b/caddyconfig/caddyfile/adapter.go
index 5b4495e..8d624f1 100644
--- a/caddyconfig/caddyfile/adapter.go
+++ b/caddyconfig/caddyfile/adapter.go
@@ -15,6 +15,7 @@
package caddyfile
import (
+ "bytes"
"encoding/json"
"fmt"
@@ -51,11 +52,17 @@ func (a Adapter) Adapt(body []byte, options map[string]interface{}) ([]byte, []c
return nil, warnings, err
}
- marshalFunc := json.Marshal
- if options["pretty"] == "true" {
- marshalFunc = caddyconfig.JSONIndent
+ // lint check: see if input was properly formatted; sometimes messy files files parse
+ // successfully but result in logical errors because the Caddyfile is a bad format
+ // TODO: also perform this check on imported files
+ if !bytes.Equal(Format(body), body) {
+ warnings = append(warnings, caddyconfig.Warning{
+ File: filename,
+ Message: "file is not formatted with 'caddy fmt'",
+ })
}
- result, err := marshalFunc(cfg)
+
+ result, err := json.Marshal(cfg)
return result, warnings, err
}
diff --git a/caddyconfig/configadapters.go b/caddyconfig/configadapters.go
index 1918fa7..1665fa0 100644
--- a/caddyconfig/configadapters.go
+++ b/caddyconfig/configadapters.go
@@ -93,12 +93,6 @@ func JSONModuleObject(val interface{}, fieldName, fieldVal string, warnings *[]W
return result
}
-// JSONIndent is used to JSON-marshal the final resulting Caddy
-// configuration in a consistent, human-readable way.
-func JSONIndent(val interface{}) ([]byte, error) {
- return json.MarshalIndent(val, "", "\t")
-}
-
// RegisterAdapter registers a config adapter with the given name.
// This should usually be done at init-time. It panics if the
// adapter cannot be registered successfully.
diff --git a/caddyconfig/httpcaddyfile/builtins_test.go b/caddyconfig/httpcaddyfile/builtins_test.go
index a255538..c06dd23 100644
--- a/caddyconfig/httpcaddyfile/builtins_test.go
+++ b/caddyconfig/httpcaddyfile/builtins_test.go
@@ -10,7 +10,6 @@ import (
func TestLogDirectiveSyntax(t *testing.T) {
for i, tc := range []struct {
input string
- expectWarn bool
expectError bool
}{
{
@@ -18,7 +17,6 @@ func TestLogDirectiveSyntax(t *testing.T) {
log
}
`,
- expectWarn: false,
expectError: false,
},
{
@@ -28,7 +26,6 @@ func TestLogDirectiveSyntax(t *testing.T) {
}
}
`,
- expectWarn: false,
expectError: false,
},
{
@@ -38,7 +35,6 @@ func TestLogDirectiveSyntax(t *testing.T) {
}
}
`,
- expectWarn: false,
expectError: true,
},
} {
@@ -47,12 +43,7 @@ func TestLogDirectiveSyntax(t *testing.T) {
ServerType: ServerType{},
}
- _, warnings, err := adapter.Adapt([]byte(tc.input), nil)
-
- if len(warnings) > 0 != tc.expectWarn {
- t.Errorf("Test %d warning expectation failed Expected: %v, got %v", i, tc.expectWarn, warnings)
- continue
- }
+ _, _, err := adapter.Adapt([]byte(tc.input), nil)
if err != nil != tc.expectError {
t.Errorf("Test %d error expectation failed Expected: %v, got %s", i, tc.expectError, err)
diff --git a/caddyconfig/httpcaddyfile/httptype_test.go b/caddyconfig/httpcaddyfile/httptype_test.go
index 233e374..69f5550 100644
--- a/caddyconfig/httpcaddyfile/httptype_test.go
+++ b/caddyconfig/httpcaddyfile/httptype_test.go
@@ -9,7 +9,6 @@ import (
func TestMatcherSyntax(t *testing.T) {
for i, tc := range []struct {
input string
- expectWarn bool
expectError bool
}{
{
@@ -18,7 +17,6 @@ func TestMatcherSyntax(t *testing.T) {
query showdebug=1
}
`,
- expectWarn: false,
expectError: false,
},
{
@@ -27,7 +25,6 @@ func TestMatcherSyntax(t *testing.T) {
query bad format
}
`,
- expectWarn: false,
expectError: true,
},
{
@@ -38,7 +35,6 @@ func TestMatcherSyntax(t *testing.T) {
}
}
`,
- expectWarn: false,
expectError: false,
},
{
@@ -47,14 +43,12 @@ func TestMatcherSyntax(t *testing.T) {
not path /somepath*
}
`,
- expectWarn: false,
expectError: false,
},
{
input: `http://localhost
@debug not path /somepath*
`,
- expectWarn: false,
expectError: false,
},
{
@@ -63,7 +57,6 @@ func TestMatcherSyntax(t *testing.T) {
}
http://localhost
`,
- expectWarn: false,
expectError: true,
},
} {
@@ -72,12 +65,7 @@ func TestMatcherSyntax(t *testing.T) {
ServerType: ServerType{},
}
- _, warnings, err := adapter.Adapt([]byte(tc.input), nil)
-
- if len(warnings) > 0 != tc.expectWarn {
- t.Errorf("Test %d warning expectation failed Expected: %v, got %v", i, tc.expectWarn, warnings)
- continue
- }
+ _, _, err := adapter.Adapt([]byte(tc.input), nil)
if err != nil != tc.expectError {
t.Errorf("Test %d error expectation failed Expected: %v, got %s", i, tc.expectError, err)
@@ -119,7 +107,6 @@ func TestSpecificity(t *testing.T) {
func TestGlobalOptions(t *testing.T) {
for i, tc := range []struct {
input string
- expectWarn bool
expectError bool
}{
{
@@ -129,7 +116,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: false,
},
{
@@ -139,7 +125,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: false,
},
{
@@ -149,7 +134,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: false,
},
{
@@ -161,7 +145,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: true,
},
{
@@ -174,7 +157,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: false,
},
{
@@ -187,7 +169,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: false,
},
{
@@ -200,7 +181,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: true,
},
{
@@ -213,7 +193,6 @@ func TestGlobalOptions(t *testing.T) {
}
:80
`,
- expectWarn: false,
expectError: true,
},
} {
@@ -222,12 +201,7 @@ func TestGlobalOptions(t *testing.T) {
ServerType: ServerType{},
}
- _, warnings, err := adapter.Adapt([]byte(tc.input), nil)
-
- if len(warnings) > 0 != tc.expectWarn {
- t.Errorf("Test %d warning expectation failed Expected: %v, got %v", i, tc.expectWarn, warnings)
- continue
- }
+ _, _, err := adapter.Adapt([]byte(tc.input), nil)
if err != nil != tc.expectError {
t.Errorf("Test %d error expectation failed Expected: %v, got %s", i, tc.expectError, err)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 17:47:49 +0000