Skip to content

Commit

Permalink
nds: add validation for tls_skip_verify (#18333)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Aug 25, 2023
1 parent 96cc610 commit da830b1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .changelog/18333.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
services: Add validation message when `tls_skip_verify` is set to `true` on a Nomad service
```
19 changes: 12 additions & 7 deletions nomad/structs/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,12 @@ func (sc *ServiceCheck) validateNomad() error {

// expose is connect (consul) specific
if sc.Expose {
return fmt.Errorf("expose may only be set for Consul service checks")
return errors.New("expose may only be set for Consul service checks")
}

// nomad checks do not have warnings
if sc.OnUpdate == OnUpdateIgnoreWarn {
return fmt.Errorf("on_update may only be set to ignore_warnings for Consul service checks")
return errors.New("on_update may only be set to ignore_warnings for Consul service checks")
}

// below are temporary limitations on checks in nomad
Expand All @@ -358,13 +358,13 @@ func (sc *ServiceCheck) validateNomad() error {
// check_restart.ignore_warnings is not a thing in Nomad (which has no warnings in checks)
if sc.CheckRestart != nil {
if sc.CheckRestart.IgnoreWarnings {
return fmt.Errorf("ignore_warnings on check_restart only supported for Consul service checks")
return errors.New("ignore_warnings on check_restart only supported for Consul service checks")
}
}

// address_mode="driver" not yet supported on nomad
if sc.AddressMode == "driver" {
return fmt.Errorf("address_mode = driver may only be set for Consul service checks")
return errors.New("address_mode = driver may only be set for Consul service checks")
}

if sc.Type == "http" {
Expand All @@ -375,17 +375,22 @@ func (sc *ServiceCheck) validateNomad() error {

// success_before_passing is consul only
if sc.SuccessBeforePassing != 0 {
return fmt.Errorf("success_before_passing may only be set for Consul service checks")
return errors.New("success_before_passing may only be set for Consul service checks")
}

// failures_before_critical is consul only
if sc.FailuresBeforeCritical != 0 {
return fmt.Errorf("failures_before_critical may only be set for Consul service checks")
return errors.New("failures_before_critical may only be set for Consul service checks")
}

// tls_server_name is consul only
if sc.TLSServerName != "" {
return fmt.Errorf("tls_server_name may only be set for Consul service checks")
return errors.New("tls_server_name may only be set for Consul service checks")
}

// tls_skip_verify is consul only
if sc.TLSSkipVerify {
return errors.New("tls_skip_verify may only be set for Consul service checks")
}

return nil
Expand Down
15 changes: 15 additions & 0 deletions nomad/structs/services_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1811,6 +1811,21 @@ func TestService_Validate(t *testing.T) {
},
expErr: true,
},
{
name: "provider nomad with tls skip verify",
input: &Service{
Name: "testservice",
Provider: "nomad",
Checks: []*ServiceCheck{
{
Name: "servicecheck",
Type: "http",
TLSSkipVerify: true,
},
},
},
expErr: true,
},
{
name: "provider nomad with connect",
input: &Service{
Expand Down

0 comments on commit da830b1

Please sign in to comment.