Feature/remote ip internal proxy support

mariusvw commented 3 years ago

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
[ ] [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

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

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

Testing checklist

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

Additional context

noelmcloughlin commented 3 years ago

Nearly there ;-) The linters want lower-case commit message: " subject must not be sentence-case, start-case, pascal-case, upper-case [subject-case]". Easiest way is git rebase: see https://wideopentech.com/how-do-i-amend-multiple-commits-with-git/ and change uppercases to lower.

myii commented 3 years ago

Perhaps it would be simpler to just amend the commit message using the Squash and merge button? The second commit isn't significant, so we could just have the one squashed commit:

feat(trusted_proxy): add support for RemoteIPInternalProxy

noelmcloughlin commented 3 years ago

Squash and merge button?

Interesting. Where is that button? I cannot see it..

myii commented 3 years ago

Interesting. Where is that button? I cannot see it..

@noelmcloughlin It's one of the drop-down options of the Merge pull request button. Note, that GitHub will remember your setting for this formula, so when you next merge a PR here, it will probably still be set to Squash and merge!

You can override the commit message in the textbox at the top, which probably has Feature/remote ip internal proxy support (#300) in it by default.

noelmcloughlin commented 3 years ago

Thanks @myii learned something new. Thanks, @mariusvw for the PR and improvements!!! Appreciated.

noelmcloughlin commented 3 years ago

The only issue with "squash and merge" is that PR gets merged immediately by me (no CI job).
However, if @mariusvw uses git rebase/squash/reword then a new commit is created and Travis CI jobs will rerun.

noelmcloughlin commented 3 years ago

anyway its merged ;-)

myii commented 3 years ago

The only issue with "squash and merge" is that PR gets merged immediately by me (no CI job). However, if @mariusvw uses git rebase/squash/reword then a new commit is created and Travis CI jobs will rerun.

Yep, I should have mentioned that. If I'm concerned about the PR before the squash and merge, I run it in my own fork first.

mariusvw commented 3 years ago

@noelmcloughlin / @myii, I'll use the semantic-release next time, no problem, I'd rather learn than someone else silently fixing it ;)

saltstack-formulas-travis commented 3 years ago

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

The release is available on GitHub release

Your semantic-release bot :package::rocket:

saltstack-formulas / apache-formula