luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1144 from hashicorp/unique-service-names

Browse source 
Ensuring check names are unique
This commit is contained in:
Diptanu Choudhury 2016-05-03 14:36:49 -07:00
parent 26a823873a 8a582c1b6c
commit d41939fefd
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nomad/structs/structs.go
View file

@ -1789,6 +1789,15 @@ func validateServices(t *Task) error {
if service.PortLabel != "" { if service.PortLabel != "" {
servicePorts[service.PortLabel] = append(servicePorts[service.PortLabel], service.Name) servicePorts[service.PortLabel] = append(servicePorts[service.PortLabel], service.Name)
} }
// Ensure that check names are unique.
knownChecks := make(map[string]struct{})
for _, check := range service.Checks {
if _, ok := knownChecks[check.Name]; ok {
mErr.Errors = append(mErr.Errors, fmt.Errorf("check %q is duplicate", check.Name))
}
knownChecks[check.Name] = struct{}{}
}
} }
// Get the set of port labels. // Get the set of port labels.

8
nomad/structs/structs_test.go
View file

@ -284,6 +284,10 @@ func TestTask_Validate_Services(t *testing.T) {
Name: "check-name", Name: "check-name",
Type: ServiceCheckTCP, Type: ServiceCheckTCP,
}, },
{
Name: "check-name",
Type: ServiceCheckTCP,
},
}, },
} }
@ -313,6 +317,10 @@ func TestTask_Validate_Services(t *testing.T) {
if !strings.Contains(err.Error(), "service \"service-name\" is duplicate") { if !strings.Contains(err.Error(), "service \"service-name\" is duplicate") {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if !strings.Contains(err.Error(), "check \"check-name\" is duplicate") {
t.Fatalf("err: %v", err)
}
} }
func TestTask_Validate_LogConfig(t *testing.T) { func TestTask_Validate_LogConfig(t *testing.T) {