luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Disallow * as service-defaults name (#10069)

This commit is contained in:
Freddy 2021-04-19 14:23:01 -06:00 committed by GitHub
parent 245b21fe56
commit 55d67824d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10069.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:breaking-change
connect: Disallow wildcard as name for service-defaults.
```

3
agent/structs/config_entry.go
View File

@ -157,6 +157,9 @@ func (e *ServiceConfigEntry) Validate() error {
if e.Name == "" { if e.Name == "" {
return fmt.Errorf("Name is required") return fmt.Errorf("Name is required")
} }
if e.Name == WildcardSpecifier {
return fmt.Errorf("service-defaults name must be the name of a service, and not a wildcard")
}
validationErr := validateConfigEntryMeta(e.Meta) validationErr := validateConfigEntryMeta(e.Meta)

7
agent/structs/config_entry_test.go
View File

@ -1699,6 +1699,13 @@ func TestServiceConfigEntry_Validate(t *testing.T) {
expect *ServiceConfigEntry expect *ServiceConfigEntry
expectErr string expectErr string
}{ }{
{
name: "wildcard name is not allowed",
input: &ServiceConfigEntry{
Name: WildcardSpecifier,
},
expectErr: `must be the name of a service, and not a wildcard`,
},
{ {
name: "upstream config override no name", name: "upstream config override no name",
input: &ServiceConfigEntry{ input: &ServiceConfigEntry{