Skip to content

Correct warnings about deprecated parameter #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2023

Conversation

hawkeye-7
Copy link

@hawkeye-7 hawkeye-7 commented Jun 7, 2023

Haproxy is emitting a warning: "The $bind_options parameter is deprecated; please use $bind instead"

This occurs even when bind_options is NOT being used.

See issue #555

@hawkeye-7 hawkeye-7 requested a review from a team as a code owner June 7, 2023 03:31
@CLAassistant
Copy link

CLAassistant commented Jun 7, 2023

CLA assistant check
All committers have signed the CLA.

@hawkeye-7
Copy link
Author

Signed Contributor License Agreement as Hawkeye-7.

@LukasAud
Copy link

Hi @hawkeye-7, the PR looks good to me, however, it needs a quick rebase before I can merge. Hopefully, CI hits green too as the RedHat 9 failures seemed to be transient.

@jordanbreen28 jordanbreen28 linked an issue Jul 3, 2023 that may be closed by this pull request
Copy link

@smortex smortex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

If you want to rebase as asked above, you can follow these steps from your working directory:

git fetch origin       # Download the latest code we have here
git rebase origin/main # Move your commits on top of the main branch
git push -f            # Send the changes (-f is required because we re-wrote history)

@marszip
Copy link

marszip commented Jul 25, 2023

Is there any progress on this, it is only a small change, but it will help to keep messages out of our puppetserver.logs?

@hawkeye-7
Copy link
Author

I don't know why it didn't make the last release. It should be easier to get trivial changes like this through.

@smortex
Copy link

smortex commented Jul 25, 2023

I don't know why it didn't make the last release. It should be easier to get trivial changes like this through.

I guess that @LukasAud is requesting a rebase so that the CI can run on this PR: while the change seems okay, a passing test suite makes us sure we are not introducing some regression due to some broken existing behavior, presence of weird chars (e.g. non-breakable spaces), etc.

See #557 (review) for rebase instructions.

Rebasing should also add some reviewers ;-)

@hawkeye-7
Copy link
Author

ram900@hawkeye7:/git$ cd puppetlabs-haproxy/
/Users/ram900/git/puppetlabs-haproxy
ram900@hawkeye7:
/git/puppetlabs-haproxy$ git fetch origin
ram900@hawkeye7:/git/puppetlabs-haproxy$ git rebase origin/main
Current branch main is up to date.
ram900@hawkeye7:
/git/puppetlabs-haproxy$ git push -f
Everything up-to-date
ram900@hawkeye7:~/git/puppetlabs-haproxy$

@smortex
Copy link

smortex commented Jul 25, 2023

The PR now has 3 commits, the 2 last one being merge commits. After a successful rebase, your are supposed to have no merge commits.

I tried to replicate what might be your setup to hopefully make the rebase instruction copy/pastable:

$ git clone https://github.com/hawkeye-7/puppetlabs-haproxy
$ cd puppetlabs-haproxy
$ git remote add puppetlabs https://github.com/puppetlabs/puppetlabs-haproxy
$ git fetch puppetlabs
$ git remote -v
origin	https://github.com/hawkeye-7/puppetlabs-haproxy (fetch)
origin	https://github.com/hawkeye-7/puppetlabs-haproxy (push)
puppetlabs	https://github.com/puppetlabs/puppetlabs-haproxy (fetch)
puppetlabs	https://github.com/puppetlabs/puppetlabs-haproxy (push)
$ git log --format=oneline puppetlabs/main..main 
0232792b5e636cf8d4c2418568a4bb1b53a41e70 (HEAD -> main, origin/main, origin/HEAD) Merge branch 'main' into main
4f918cbb96ec5979deba7f764af4047e33425926 Merge branch 'main' into main
8aa521cf389bba5c6ae60d1fa479a6b0915c7399 Suppress spurious warning about bind_options

Here we are on top of origin/main, and we want the commits to be on top of puppetlabs/main.

First, we make sure that the local repo know what is the current state of the puppetlabs remote:

$ git fetch puppetlabs

Then, we can do the actual rebase of the current branch on top of the reference one:

$ git rebase puppetlabs/main
$ git log --format=oneline puppetlabs/main..main
514095b88cce20b8d571479c3c5dbb423b68549a (HEAD -> main) Suppress spurious warning about bind_options

Finally we push the local branch to your fork to update the PR:

$ git push -f

@hawkeye-7
Copy link
Author

Run with the new instructions. Your rebase has been done.

Copy link

@smortex smortex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! @LukasAud can you approve the PR to run CI against it?

@malikparvez malikparvez merged commit fdbb68f into puppetlabs:main Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Haproxy emits an incorrect warning
8 participants