feat(httpchecks): support multiple httpcheck lines

ze42 commented 2 years ago

httpcheck was a single value, and required to be a single string Allow httpchecks (with an s, like other such options) to be a list to repeat the option

PR progress checklist (to be filled in by reviewers)

[ ] Changes to documentation are appropriate (or tick if not required)
[ ] Changes to tests are appropriate (or tick if not required)
[ ] Reviews completed

What type of PR is this?

Primary type

[ ] [build] Changes related to the build system
[ ] [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
[ ] [ci] Changes to the continuous integration configuration
[x] [feat] A new feature
[ ] [fix] A bug fix
[ ] [perf] A code change that improves performance
[ ] [refactor] A code change that neither fixes a bug nor adds a feature
[ ] [revert] A change used to revert a previous commit
[ ] [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

[ ] [docs] Documentation changes
[ ] [test] Adding missing or correcting existing tests

Does this PR introduce a `BREAKING CHANGE`?

No.

Related issues and/or pull requests

Describe the changes you're proposing

httpcheck was a single value, and required to be a single string. But the documentation and example often place multiple such lines.

Allow httpchecks (with an s, like other such options) to be a list to repeat the option

Pillar / config required to test the proposed changes

Any that would replace httpcheck by httpchecks and possibly with multiple lines. (in listeners, or backend).

Debug log showing how the proposed changes work

Documentation checklist

[ ] Updated the README (e.g. Available states).
[x] Updated pillar.example.

Testing checklist

[ ] Included in Kitchen (i.e. under state_top).
[ ] Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
[x] Updated the relevant test pillar.

Additional context

myii commented 2 years ago

Thanks for this PR, @ze42.

Looking at the test setup, unfortunately we're only testing the basics of the haproxy.cfg file:

https://github.com/saltstack-formulas/haproxy-formula/blob/b3f0d86cc22628c9e269fa9fcd191e6630a9bd7c/test/integration/default/controls/config.rb#L5-L10

Meaning, there's no testing of the actual file contents.

Furthermore, I didn't see any examples of httpcheck in the pillar.example or test pillars.

I decided that we should have values for both httpcheck and httpchecks in the pillar files, so that the code is being tested, at the very least (while not being verified). I've added that commit to this PR.

Used these sources when looking for appropriate values to use:

myii commented 2 years ago

Merged, thanks @ze42.

saltstack-formulas-travis commented 2 years ago

:tada: This PR is included in version 0.18.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

saltstack-formulas / haproxy-formula