github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

config: allow running `consul agent -dev -ui-dir=some_path` (#7525) 

When run in with `-dev` in DevMode, it is not possible to replace
the embeded UI with another one because `-dev` implies `-ui`.

This commit allows this an slightly change the error message
about Consul 0.7.0 which is very old and does not apply to
current version anyway.
pull/7561/head
Pierre Souchay 2020-03-31 22:36:20 +02:00 committed by GitHub
parent ab6c410064
commit 54b22c638d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/config/builder.go
View File

@ -1095,11 +1095,12 @@ func (b *Builder) Validate(rt RuntimeConfig) error {
if rt.ACLDatacenter != "" && !reDatacenter.MatchString(rt.ACLDatacenter) { if rt.ACLDatacenter != "" && !reDatacenter.MatchString(rt.ACLDatacenter) {
return fmt.Errorf("acl_datacenter cannot be %q. Please use only [a-z0-9-_]", rt.ACLDatacenter) return fmt.Errorf("acl_datacenter cannot be %q. Please use only [a-z0-9-_]", rt.ACLDatacenter)
} }
if rt.EnableUI && rt.UIDir != "" { // In DevMode, UI is enabled by default, so to enable rt.UIDir, don't perform this check
if !rt.DevMode && rt.EnableUI && rt.UIDir != "" {
return fmt.Errorf( return fmt.Errorf(
"Both the ui and ui-dir flags were specified, please provide only one.\n" + "Both the ui and ui-dir flags were specified, please provide only one.\n" +
"If trying to use your own web UI resources, use the ui-dir flag.\n" + "If trying to use your own web UI resources, use the ui-dir flag.\n" +
"If using Consul version 0.7.0 or later, the web UI is included in the binary so use ui to enable it") "The web UI is included in the binary so use ui to enable it")
} }
if rt.DNSUDPAnswerLimit < 0 { if rt.DNSUDPAnswerLimit < 0 {
return fmt.Errorf("dns_config.udp_answer_limit cannot be %d. Must be greater than or equal to zero", rt.DNSUDPAnswerLimit) return fmt.Errorf("dns_config.udp_answer_limit cannot be %d. Must be greater than or equal to zero", rt.DNSUDPAnswerLimit)

2
agent/config/runtime_test.go
View File

@ -1857,7 +1857,7 @@ func TestConfigFlagsAndEdgecases(t *testing.T) {
hcl: []string{`ui = true ui_dir = "a"`}, hcl: []string{`ui = true ui_dir = "a"`},
err: "Both the ui and ui-dir flags were specified, please provide only one.\n" + err: "Both the ui and ui-dir flags were specified, please provide only one.\n" +
"If trying to use your own web UI resources, use the ui-dir flag.\n" + "If trying to use your own web UI resources, use the ui-dir flag.\n" +
"If using Consul version 0.7.0 or later, the web UI is included in the binary so use ui to enable it", "The web UI is included in the binary so use ui to enable it",
}, },
// test ANY address failures // test ANY address failures